Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

Raise source compatibility to 1.7 (Java7)

Browse source 
Now that Java 8 is released, it's time to raise Smack's source
compatibility. Let's also use some of the "new" Java 7 features like
"catch multiple".
This commit is contained in:
Florian Schmaus 2014-03-23 23:12:15 +01:00
parent 18d0dbdc5f
commit cc026a7e85
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ allprojects {
oneLineDesc = 'An Open Source XMPP (Jabber) client library' oneLineDesc = 'An Open Source XMPP (Jabber) client library'
} }
group = 'org.igniterealtime.smack' group = 'org.igniterealtime.smack'
sourceCompatibility = 1.6 sourceCompatibility = 1.7
version = shortVersion version = shortVersion
if (isSnapshot) { if (isSnapshot) {
version += '-SNAPSHOT' version += '-SNAPSHOT'

6
extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
View file

@ -574,11 +574,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
try { try {
proxyInfo = serviceDiscoveryManager.discoverInfo(item.getEntityID()); proxyInfo = serviceDiscoveryManager.discoverInfo(item.getEntityID());
} }
catch (NoResponseException e) { catch (NoResponseException|XMPPErrorException e) {
// blacklist errornous server
proxyBlacklist.add(item.getEntityID());
continue; }
catch (XMPPErrorException e) {
// blacklist errornous server // blacklist errornous server
proxyBlacklist.add(item.getEntityID()); proxyBlacklist.add(item.getEntityID());
continue; continue;