better control of sortBound; should help to avoid an indexOutOfBound …

…Exception git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3023 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Nov 30, 2006 · 9dfae90 · 9dfae90
1 parent 4ce5906
commit 9dfae90
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/source/de/anomic/kelondro/kelondroRowCollection.java b/source/de/anomic/kelondro/kelondroRowCollection.java
@@ -361,17 +361,6 @@ public void select(Set keys) {
         }
     }
 
-    protected final void sort(kelondroOrder newOrder, int newColumn) {
-        if ((this.sortOrder == null) ||
-            (!(this.sortOrder.signature().equals(newOrder.signature()))) ||
-            (newColumn != this.sortColumn)) {
-            this.sortOrder = newOrder;
-            this.sortBound = 0;
-            this.sortColumn = newColumn;
-        }
-        sort();
-    }
-
     protected final void sort() {
         assert (this.sortOrder != null);
         if (this.sortBound == this.chunkcount) return; // this is already sorted

diff --git a/source/de/anomic/kelondro/kelondroRowSet.java b/source/de/anomic/kelondro/kelondroRowSet.java
@@ -223,6 +223,7 @@ public void setOrdering(kelondroOrder newOrder, int newColumn) {
         if ((this.sortOrder == null) ||
                 (!(this.sortOrder.signature().equals(newOrder.signature()))) ||
                 (newColumn != this.sortColumn)) {
+            resolveMarkedRemoved();
             this.sortOrder = newOrder;
             this.sortBound = 0;
             this.sortColumn = newColumn;