From 5394151e4287ee1b497fbe3aac4bddd16275268a Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 28 Feb 2014 05:52:49 -0500 Subject: [PATCH] minor correction to an if statement that missed the explicit check against null Former-commit-id: 115a691e3eb74038a1ed7f5d7fe357cb0b2b2a06 --- .../org/owasp/dependencycheck/data/nexus/NexusSearch.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java index 3580d0dc2..e8a18055e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java @@ -69,7 +69,7 @@ public class NexusSearch { this.rootURL = rootURL; try { 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; LOGGER.fine("Using proxy"); } else { @@ -140,9 +140,9 @@ public class NexusSearch { doc); return new MavenArtifact(groupId, artifactId, version, link); } catch (FileNotFoundException fnfe) { - // This is what we get when the SHA1 they sent doesn't exist in - // Nexus. This - // is useful upstream for recovery, so we just re-throw it + /* This is what we get when the SHA1 they sent doesn't exist in + * Nexus. This is useful upstream for recovery, so we just re-throw it + */ throw fnfe; } catch (Exception e) { // Anything else is jacked-up XML stuff that we really can't recover