bug: Also apply BranchFilter to parent branch in RecursiveBranchProvider0.9.9.v201104220001_RC

2 files changed, 5 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/BranchOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/BranchOperation.java
index 80bb48fcb20..a22f630bac2 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/BranchOperation.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/BranchOperation.java
@@ -54,6 +54,7 @@ public final class BranchOperation extends AbstractOperation {
          log(subOp.getName());
          doSubWork(subOp, monitor, 0);
       }
+      log("Branch Operation Completed.");
    }
 
    private List<Branch> order(Collection<Branch> branches) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/RecursiveBranchProvider.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/RecursiveBranchProvider.java
index bcc6a63c7e2..41308ca27ea 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/RecursiveBranchProvider.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/RecursiveBranchProvider.java
@@ -34,8 +34,11 @@ public final class RecursiveBranchProvider implements IBranchesProvider {
    public Collection<Branch> getBranches() throws OseeCoreException {
       Conditions.checkNotNull(parentBranch, "seed");
       Set<Branch> children = new HashSet<Branch>();
+
       parentBranch.getChildBranches(children, true, filter);
-      children.add(parentBranch);
+      if (filter.matches(parentBranch)) {
+         children.add(parentBranch);
+      }
       return children;
    }
 }
\ No newline at end of file