From 7b12e77a638cca5844bb41519504e50939f6b96c Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 3 Sep 2008 00:50:42 +0000 Subject: [PATCH] fix for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=1393&hilit=&p=9655#p9655 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5103 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/de/anomic/kelondro/kelondroCollectionIndex.java | 2 +- source/de/anomic/kelondro/kelondroFlexWidthArray.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/de/anomic/kelondro/kelondroCollectionIndex.java b/source/de/anomic/kelondro/kelondroCollectionIndex.java index 3c9261e0b..2b45a05e0 100644 --- a/source/de/anomic/kelondro/kelondroCollectionIndex.java +++ b/source/de/anomic/kelondro/kelondroCollectionIndex.java @@ -279,7 +279,7 @@ public class kelondroCollectionIndex { if (propfile.exists()) { props = serverFileUtils.loadHashMap(propfile); final String stored_rowdef = props.get("rowdef"); - if ((stored_rowdef == null) || (!(rowdef.subsumes(new kelondroRow(stored_rowdef, rowdef.objectOrder, 0))))) { + if ((rowdef != null) && (!(rowdef.subsumes(new kelondroRow(stored_rowdef, rowdef.objectOrder, 0))))) { System.out.println("FATAL ERROR: stored rowdef '" + stored_rowdef + "' does not match with new rowdef '" + rowdef + "' for array cluster '" + path + "/" + filenameStub + "'"); System.exit(-1); diff --git a/source/de/anomic/kelondro/kelondroFlexWidthArray.java b/source/de/anomic/kelondro/kelondroFlexWidthArray.java index 8dfae9f1f..461302285 100644 --- a/source/de/anomic/kelondro/kelondroFlexWidthArray.java +++ b/source/de/anomic/kelondro/kelondroFlexWidthArray.java @@ -105,7 +105,7 @@ public class kelondroFlexWidthArray implements kelondroArray { if (propfile.exists()) { props = serverFileUtils.loadHashMap(propfile); final String stored_rowdef = props.get("rowdef"); - if ((stored_rowdef == null) || (!(rowdef.subsumes(new kelondroRow(stored_rowdef, rowdef.objectOrder, 0))))) { + if ((stored_rowdef != null) && (!(rowdef.subsumes(new kelondroRow(stored_rowdef, rowdef.objectOrder, 0))))) { System.out.println("FATAL ERROR: stored rowdef '" + stored_rowdef + "' does not match with new rowdef '" + rowdef + "' for flex table '" + path + "', table " + tablename); System.exit(-1);