diff --git a/build.gradle b/build.gradle index d66bc4788..1dc2ec199 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { oneLineDesc = 'An Open Source XMPP (Jabber) client library' } group = 'org.igniterealtime.smack' - sourceCompatibility = 1.6 + sourceCompatibility = 1.7 version = shortVersion if (isSnapshot) { version += '-SNAPSHOT' diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index 247abd192..6a51acb4a 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -574,11 +574,7 @@ public final class Socks5BytestreamManager implements BytestreamManager { try { proxyInfo = serviceDiscoveryManager.discoverInfo(item.getEntityID()); } - catch (NoResponseException e) { - // blacklist errornous server - proxyBlacklist.add(item.getEntityID()); - continue; } - catch (XMPPErrorException e) { + catch (NoResponseException|XMPPErrorException e) { // blacklist errornous server proxyBlacklist.add(item.getEntityID()); continue;