From 99dd04a1c18ab8ee4821dc2613c09734fca89179 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 11 May 2015 20:31:50 -0400 Subject: [PATCH] findbugs correction Former-commit-id: 79dc73b57f2d025754e0fc717610e9a067f1a155 --- .../dependencycheck/maven/AggregateMojo.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java index 35b4e93f6..23d9bd737 100644 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java +++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java @@ -139,10 +139,8 @@ public class AggregateMojo extends BaseDependencyCheckMojo { try { File mpp = new File(project.getBasedir(), m); mpp = mpp.getCanonicalFile(); - if (mpp.compareTo(mod.getBasedir()) == 0) { - if (descendants.add(mod)) { - LOGGER.fine(String.format("Decendent module %s added", mod.getName())); - } + if (mpp.compareTo(mod.getBasedir()) == 0 && descendants.add(mod)) { + LOGGER.fine(String.format("Decendent module %s added", mod.getName())); } } catch (IOException ex) { LOGGER.log(Level.FINE, "Unable to determine module path", ex); @@ -157,10 +155,9 @@ public class AggregateMojo extends BaseDependencyCheckMojo { LOGGER.fine(String.format("Decendent %s added", p.getName())); } for (MavenProject modTest : getReactorProjects()) { - if (p.getModules() != null && p.getModules().contains(modTest.getName())) { - if (descendants.add(modTest)) { - LOGGER.fine(String.format("Decendent %s added", modTest.getName())); - } + if (p.getModules() != null && p.getModules().contains(modTest.getName()) + && descendants.add(modTest)) { + LOGGER.fine(String.format("Decendent %s added", modTest.getName())); } } } @@ -169,10 +166,8 @@ public class AggregateMojo extends BaseDependencyCheckMojo { try { File mpp = new File(dec.getBasedir(), mod); mpp = mpp.getCanonicalFile(); - if (mpp.compareTo(p.getBasedir()) == 0) { - if (descendants.add(p)) { - LOGGER.fine(String.format("Decendent module %s added", p.getName())); - } + if (mpp.compareTo(p.getBasedir()) == 0 && descendants.add(p)) { + LOGGER.fine(String.format("Decendent module %s added", p.getName())); } } catch (IOException ex) { LOGGER.log(Level.FINE, "Unable to determine module path", ex);