From ee0fbff002e17a56aca09cb8dc7da0f4fe20ad6e Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 31 Jul 2007 21:38:45 +0000
Subject: [PATCH]
---
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index 67cc08e..f53fdbc 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -1090,8 +1090,10 @@
}
// Remove any overlapping include branches.
- for(DN includeDN : includeBranches)
+ Iterator<DN> includeBranchIterator = includeBranches.iterator();
+ while(includeBranchIterator.hasNext())
{
+ DN includeDN = includeBranchIterator.next();
boolean keep = true;
for(DN dn : includeBranches)
{
@@ -1103,15 +1105,17 @@
}
if(!keep)
{
- includeBranches.remove(includeDN);
+ includeBranchIterator.remove();
}
}
// Remvoe any exclude branches that are not are not under a include
// branch since they will be migrated as part of the existing entries
// outside of the include branches anyways.
- for(DN excludeDN : excludeBranches)
+ Iterator<DN> excludeBranchIterator = excludeBranches.iterator();
+ while(excludeBranchIterator.hasNext())
{
+ DN excludeDN = excludeBranchIterator.next();
boolean keep = false;
for(DN includeDN : includeBranches)
{
@@ -1123,7 +1127,7 @@
}
if(!keep)
{
- excludeBranches.remove(excludeDN);
+ excludeBranchIterator.remove();
}
}
--
Gitblit v1.10.0