Views: in some situations, an ArrayIndexOutOfBoundsException was thrown when…

Views: in some situations, an ArrayIndexOutOfBoundsException was thrown when using the same view concurrently.

h2/src/main/org/h2/index/ViewIndex.java

@@ -107,9 +107,7 @@ public class ViewIndex extends BaseIndex {
             }
         }
         Query query = (Query) session.prepare(querySQL, true);
-        if (masks == null) {
-            columns = new Column[0];
-        } else {
+        if (masks != null) {
             IntArray paramIndex = new IntArray();
             for (int i = 0; i < masks.length; i++) {
                 int mask = masks[i];
@@ -119,11 +117,8 @@ public class ViewIndex extends BaseIndex {
                 paramIndex.add(i);
             }
             int len = paramIndex.size();
-            columns = new Column[len];
             for (int i = 0; i < len; i++) {
                 int idx = paramIndex.get(i);
-                Column col = table.getColumn(idx);
-                columns[i] = col;
                 int mask = masks[idx];
                 int nextParamIndex = query.getParameters().size() + view.getParameterOffset();
                 if ((mask & IndexCondition.EQUALITY) != 0) {

h2/src/test/org/h2/test/db/TestView.java

@@ -84,7 +84,7 @@ public class TestView extends TestBase {
             s.execute("select * from t" + (i + 1));
             ResultSet rs = s.executeQuery("select count(*) from t" + (i + 1) + " where id=2");
             assertTrue(rs.next());
-            assertEquals(rs.getInt(1), 1);
+            assertEquals(1, rs.getInt(1));
         }
         conn.close();
         conn = getConnection("view");