minor correction to an if statement that missed the explicit check against null

Former-commit-id: 115a691e3eb74038a1ed7f5d7fe357cb0b2b2a06
This commit is contained in:
Jeremy Long
2014-02-28 05:52:49 -05:00
parent 9349e9cd99
commit 5394151e42

View File

@@ -69,7 +69,7 @@ public class NexusSearch {
this.rootURL = rootURL; this.rootURL = rootURL;
try { try {
if (null != Settings.getString(Settings.KEYS.PROXY_URL) if (null != Settings.getString(Settings.KEYS.PROXY_URL)
&& Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) { && null != Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {
useProxy = true; useProxy = true;
LOGGER.fine("Using proxy"); LOGGER.fine("Using proxy");
} else { } else {
@@ -140,9 +140,9 @@ public class NexusSearch {
doc); doc);
return new MavenArtifact(groupId, artifactId, version, link); return new MavenArtifact(groupId, artifactId, version, link);
} catch (FileNotFoundException fnfe) { } catch (FileNotFoundException fnfe) {
// This is what we get when the SHA1 they sent doesn't exist in /* This is what we get when the SHA1 they sent doesn't exist in
// Nexus. This * Nexus. This is useful upstream for recovery, so we just re-throw it
// is useful upstream for recovery, so we just re-throw it */
throw fnfe; throw fnfe;
} catch (Exception e) { } catch (Exception e) {
// Anything else is jacked-up XML stuff that we really can't recover // Anything else is jacked-up XML stuff that we really can't recover