--no commit message

--no commit message

h2/src/main/org/h2/expression/ExpressionColumn.java

@@ -171,7 +171,7 @@ public class ExpressionColumn extends Expression {
     }
 
     public void setEvaluatable(TableFilter tableFilter, boolean b) {
-        if (tableFilter == resolver.getTableFilter()) {
+        if (resolver != null && tableFilter == resolver.getTableFilter()) {
             evaluatable = b;
         }
     }

h2/src/main/org/h2/store/Storage.java

@@ -253,23 +253,12 @@ public class Storage {
         pages.removeValue(i);
     }
     
-private int test;
-//private static long totalCheck;
     private void checkOnePage() throws SQLException {
-//        if(true) return;
-//long time = System.currentTimeMillis();
         pageCheckIndex = (pageCheckIndex + 1) % pages.size();
         int page = pages.get(pageCheckIndex);
-        if (file.isPageFree(page)) {
-//System.out.println("found one! " + page);            
+        if (file.isPageFree(page) && file.getPageOwner(page) == id) {
             file.setPageOwner(page, -1);
         }
-//time = System.currentTimeMillis() - time;
-//totalCheck+= time;
-//if(totalCheck > 1000) {
-//    System.out.println("##took one second");
-//    totalCheck--;
-//}
     }
 
 }