orbiter 17 years ago
parent 05dbba4bab
commit 7b12e77a63

@ -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);

@ -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);

Loading…
Cancel
Save