From b7457d3807df586617068d73e8cbd9dc67a8ef60 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 17 May 2009 21:44:02 +0000
Subject: [PATCH] patch for
 http://forum.yacy-websuche.de/viewtopic.php?p=14720#p14720

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5960 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/kelondro/index/RowSet.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/de/anomic/kelondro/index/RowSet.java b/source/de/anomic/kelondro/index/RowSet.java
index 5deb740f7..abf5b3b45 100644
--- a/source/de/anomic/kelondro/index/RowSet.java
+++ b/source/de/anomic/kelondro/index/RowSet.java
@@ -169,12 +169,18 @@ public class RowSet extends RowCollection implements ObjectIndex, Iterable<Row.E
     }
     
     private synchronized Row.Entry remove(final byte[] a, final int start, final int length) {
-        final int index = find(a, start, length);
-        if (index < 0) return null;
-        final Row.Entry entry = super.get(index, true);
-        super.removeRow(index, true); // keep order of collection!
-        int findagainindex = 0;
-        assert (findagainindex = find(a, start, length)) < 0 : "remove: chunk found again at index position (after  remove) " + findagainindex + ", index(before) = " + index + ", inset=" + NaturalOrder.arrayList(super.chunkcache, super.rowdef.objectsize * findagainindex, length) + ", searchkey=" + NaturalOrder.arrayList(a, start, length); // check if the remove worked
+        int index;
+        Row.Entry entry = null;
+        int s = this.size();
+        while ((index = find(a, start, length)) >= 0) {
+        	entry = super.get(index, true);
+        	super.removeRow(index, true); // keep order of collection!
+        	// in case that the RowSet is not uniq, we must search again to delete all entries
+        	// the following check will ensure that the process terminates
+        	assert (this.size() < s);
+        	if (this.size() >= s) return entry;
+            //assert (findagainindex = find(a, start, length)) < 0 : "remove: chunk found again at index position (after  remove) " + findagainindex + ", index(before) = " + index + ", inset=" + NaturalOrder.arrayList(super.chunkcache, super.rowdef.objectsize * findagainindex, length) + ", searchkey=" + NaturalOrder.arrayList(a, start, length); // check if the remove worked
+        }
         return entry;
     }