corrected database row iteration

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7055 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/net/yacy/kelondro/blob/BEncodedHeap.java

@@ -184,13 +184,14 @@ public class BEncodedHeap implements Iterable<Map.Entry<byte[], Map<String, byte
 
     /**
      * iterate all rows of the table.
-     * Be aware that this first closes the table to force flushing of all elements in 
-     * the write buffer. After that an iterator on the closed file is generated and then
-     * the file is opened again.
      */
     public Iterator<Map.Entry<byte[], Map<String, byte[]>>> iterator() {
         File location = this.table.location();
         int keylen = this.table.keylength();
+        try {
+            this.table.flushBuffer();
+            return new EntryIter(location, keylen);
+        } catch (IOException e1) {
             ByteOrder order = this.table.ordering();
             int buffermax = this.table.getBuffermax();
             this.table.close();
@@ -203,6 +204,7 @@ public class BEncodedHeap implements Iterable<Map.Entry<byte[], Map<String, byte
                 return null;
             }
         }
+    }
     
     /**
      * iterate all rows of the table. this is a static method that expects that the given

source/net/yacy/kelondro/blob/Heap.java

@@ -158,7 +158,7 @@ public final class Heap extends HeapModifier implements BLOB {
      * @throws IOException
      * @throws RowSpaceExceededException 
      */
-    private void flushBuffer() throws IOException {
+    public void flushBuffer() throws IOException {
         // check size of buffer
         Iterator<Map.Entry<byte[], byte[]>> i = this.buffer.entrySet().iterator();
         int l = 0;