Fix NPE from URL->URI conversion

new URL(null) throws MUE
new URI(null) throws NPE
This commit is contained in:
zzz
2015-11-08 18:14:42 +00:00
parent 63ddf11799
commit bdde11c0ef

View File

@@ -875,16 +875,18 @@ public class TrackerClient implements Runnable {
} }
/** /**
* @param ann an announce URL * @param ann an announce URL, may be null, returns false if null
* @return true for i2p hosts only * @return true for i2p hosts only
* @since 0.7.12 * @since 0.7.12
*/ */
public static boolean isValidAnnounce(String ann) { public static boolean isValidAnnounce(String ann) {
if (ann == null)
return false;
URI url; URI url;
try { try {
url = new URI(ann); url = new URI(ann);
} catch (URISyntaxException use) { } catch (URISyntaxException use) {
return false; return false;
} }
return "http".equals(url.getScheme()) && url.getHost() != null && return "http".equals(url.getScheme()) && url.getHost() != null &&
(url.getHost().endsWith(".i2p") || url.getHost().equals("i2p")); (url.getHost().endsWith(".i2p") || url.getHost().equals("i2p"));