From fcdf000fbc79810522370294cd251fd643826a49 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 3 Apr 2007 22:08:40 +0000
Subject: [PATCH] bugfix for
 http://www.yacy-forum.de/viewtopic.php?p=33838#33838

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3543 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/kelondro/kelondroFlexTable.java | 2 ++
 source/de/anomic/server/serverInstantThread.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/de/anomic/kelondro/kelondroFlexTable.java b/source/de/anomic/kelondro/kelondroFlexTable.java
index c6e7a8b3b..d060f1e1c 100644
--- a/source/de/anomic/kelondro/kelondroFlexTable.java
+++ b/source/de/anomic/kelondro/kelondroFlexTable.java
@@ -285,6 +285,8 @@ public class kelondroFlexTable extends kelondroFlexWidthArray implements kelondr
     }
     
     public synchronized kelondroCloneableIterator rows(boolean up, byte[] firstKey) throws IOException {
+        if (ROindex == null) return new rowIterator(RWindex, up, firstKey);
+        if (RWindex == null) return new rowIterator(ROindex, up, firstKey);
         return new kelondroMergeIterator(
                 new rowIterator(ROindex, up, firstKey),
                 new rowIterator(RWindex, up, firstKey),
diff --git a/source/de/anomic/server/serverInstantThread.java b/source/de/anomic/server/serverInstantThread.java
index 100f4ae99..2c056f22f 100644
--- a/source/de/anomic/server/serverInstantThread.java
+++ b/source/de/anomic/server/serverInstantThread.java
@@ -120,7 +120,7 @@ public final class serverInstantThread extends serverAbstractThread implements s
             String targetException = e.getTargetException().getMessage();
             e.getTargetException().printStackTrace();
             e.printStackTrace();
-            if ((targetException.indexOf("heap space") > 0) || (targetException.indexOf("NullPointerException") > 0)) e.getTargetException().printStackTrace();
+            if ((targetException != null) && ((targetException.indexOf("heap space") > 0) || (targetException.indexOf("NullPointerException") > 0))) e.getTargetException().printStackTrace();
             serverLog.logSevere("SERVER", "Runtime Error in serverInstantThread.job, thread '" + this.getName() + "': " + e.getMessage() + "; target exception: " + targetException, e.getTargetException());
             e.getTargetException().printStackTrace();
         } catch (OutOfMemoryError e) {