diff options
| author | jmisinco | 2011-05-19 18:53:54 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-05-19 18:53:54 +0000 |
| commit | fb6f6d04469e126dfe133bffcc3bacf0842564f0 (patch) | |
| tree | 3fb95e0ea8649af3dcb0d3601064edb6dba38c6f /plugins/org.eclipse.osee.framework.branch.management | |
| parent | 3b525e8167a5acf90fb18363c02209f8c19b5e05 (diff) | |
| download | org.eclipse.osee-fb6f6d04469e126dfe133bffcc3bacf0842564f0.tar.gz org.eclipse.osee-fb6f6d04469e126dfe133bffcc3bacf0842564f0.tar.xz org.eclipse.osee-fb6f6d04469e126dfe133bffcc3bacf0842564f0.zip | |
bug[bgz_342607]: Fix DeletedBranchProvider ConcurrentModificationException
Diffstat (limited to 'plugins/org.eclipse.osee.framework.branch.management')
| -rw-r--r-- | plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/DeletedBranchProvider.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/DeletedBranchProvider.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/DeletedBranchProvider.java index c581df76db9..5eb712b1350 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/DeletedBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/DeletedBranchProvider.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.branch.management.purge; import java.util.Collection; +import java.util.LinkedHashSet; import java.util.List; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; @@ -39,10 +40,12 @@ public final class DeletedBranchProvider implements IBranchesProvider { branchFilter.setNegatedBranchTypes(BranchType.BASELINE); List<Branch> branches = branchCache.getBranches(branchFilter); + Collection<Branch> branchesToReturn = new LinkedHashSet<Branch>(); + branchesToReturn.addAll(branches); for (Branch branch : branches) { - branch.getChildBranches(branches, true, branchFilter); + branch.getChildBranches(branchesToReturn, true, branchFilter); } - return branches; + return branchesToReturn; } }
\ No newline at end of file |