github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 18:11:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

findbugs correction

Browse Source 
Former-commit-id: 79dc73b57f2d025754e0fc717610e9a067f1a155
This commit is contained in:
Jeremy Long
2015-05-11 20:31:50 -04:00
parent 29c47e3e96
commit 99dd04a1c1
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java
View File

@@ -139,10 +139,8 @@ public class AggregateMojo extends BaseDependencyCheckMojo {
try { try {
File mpp = new File(project.getBasedir(), m); File mpp = new File(project.getBasedir(), m);
mpp = mpp.getCanonicalFile(); mpp = mpp.getCanonicalFile();
if (mpp.compareTo(mod.getBasedir()) == 0) { if (mpp.compareTo(mod.getBasedir()) == 0 && descendants.add(mod)) {
if (descendants.add(mod)) { LOGGER.fine(String.format("Decendent module %s added", mod.getName()));
LOGGER.fine(String.format("Decendent module %s added", mod.getName()));
}
} }
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.FINE, "Unable to determine module path", 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())); LOGGER.fine(String.format("Decendent %s added", p.getName()));
} }
for (MavenProject modTest : getReactorProjects()) { for (MavenProject modTest : getReactorProjects()) {
if (p.getModules() != null && p.getModules().contains(modTest.getName())) { if (p.getModules() != null && p.getModules().contains(modTest.getName())
if (descendants.add(modTest)) { && descendants.add(modTest)) {
LOGGER.fine(String.format("Decendent %s added", modTest.getName())); LOGGER.fine(String.format("Decendent %s added", modTest.getName()));
}
} }
} }
} }
@@ -169,10 +166,8 @@ public class AggregateMojo extends BaseDependencyCheckMojo {
try { try {
File mpp = new File(dec.getBasedir(), mod); File mpp = new File(dec.getBasedir(), mod);
mpp = mpp.getCanonicalFile(); mpp = mpp.getCanonicalFile();
if (mpp.compareTo(p.getBasedir()) == 0) { if (mpp.compareTo(p.getBasedir()) == 0 && descendants.add(p)) {
if (descendants.add(p)) { LOGGER.fine(String.format("Decendent module %s added", p.getName()));
LOGGER.fine(String.format("Decendent module %s added", p.getName()));
}
} }
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.FINE, "Unable to determine module path", ex); LOGGER.log(Level.FINE, "Unable to determine module path", ex);