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

Merge pull request #375 from skitt/cme-fix

Browse Source 
Avoid ConcurrentModificationExceptions
This commit is contained in:
Jeremy Long
2015-10-10 05:52:32 -04:00
parent e7f518264a 1852b9dbb2
commit b2500939f3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,15 +173,14 @@ public class AggregateMojo extends BaseDependencyCheckMojo {
} }
} }
} }
Set<MavenProject> addedDescendants = new HashSet<MavenProject>();
for (MavenProject dec : descendants) { for (MavenProject dec : descendants) {
for (String mod : dec.getModules()) { for (String mod : dec.getModules()) {
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 && descendants.add(p)) { if (mpp.compareTo(p.getBasedir()) == 0) {
if (getLog().isDebugEnabled()) { addedDescendants.add(p);
getLog().debug(String.format("Decendent module %s added", p.getName()));
}
} }
} catch (IOException ex) { } catch (IOException ex) {
if (getLog().isDebugEnabled()) { if (getLog().isDebugEnabled()) {
@@ -190,6 +189,11 @@ public class AggregateMojo extends BaseDependencyCheckMojo {
} }
} }
} }
for (MavenProject addedDescendant : addedDescendants) {
if (descendants.add(addedDescendant) && getLog().isDebugEnabled()) {
getLog().debug(String.format("Decendent module %s added", addedDescendant.getName()));
}
}
} }
} while (size != 0 && size != descendants.size()); } while (size != 0 && size != descendants.size());
if (getLog().isDebugEnabled()) { if (getLog().isDebugEnabled()) {