Merge pull request #607 from andreitokar/issue_580

Issue 580: NPE on store reopen

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -162,7 +162,7 @@ public class MVTableEngine implements TableEngine {
                 }
                 this.transactionStore = new TransactionStore(
                         store,
-                        new ValueDataType(null, db, null));
+                        new ValueDataType(db.getCompareMode(), db, null));
                 transactionStore.init();
             } catch (IllegalStateException e) {
                 throw convertIllegalStateException(e);

h2/src/main/org/h2/mvstore/db/ValueDataType.java

@@ -101,7 +101,7 @@ public class ValueDataType implements DataType {
             int bl = bx.length;
             int len = Math.min(al, bl);
             for (int i = 0; i < len; i++) {
-                int sortType = sortTypes[i];
+                int sortType = sortTypes == null ? SortOrder.ASCENDING : sortTypes[i];
                 int comp = compareValues(ax[i], bx[i], sortType);
                 if (comp != 0) {
                     return comp;