--no commit message

--no commit message

h2/src/main/org/h2/engine/Database.java

@@ -1470,8 +1470,10 @@ public class Database implements DataHandler {
      */
     public Session[] getSessions(boolean includingSystemSession) {
         ArrayList<Session> list = New.arrayList(userSessions);
-        if (includingSystemSession && systemSession != null) {
-            list.add(systemSession);
+        // copy, to ensure the reference is stable
+        Session sys = systemSession;
+        if (includingSystemSession && sys != null) {
+            list.add(sys);
         }
         Session[] array = new Session[list.size()];
         list.toArray(array);

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

@@ -65,6 +65,10 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
         }
     }
 
+    public int getRootPageId() {
+        return 0;
+    }
+
     /**
      * Close this index.
      *

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

@@ -256,4 +256,11 @@ public interface Index extends SchemaObject {
      */
     void commit(int operation, Row row) throws SQLException;
 
+    /**
+     * Get the root page of this index.
+     *
+     * @return the root page id
+     */
+    int getRootPageId();
+
 }

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

@@ -57,6 +57,10 @@ public class MultiVersionIndex implements Index {
         }
     }
 
+    public int getRootPageId() {
+        return base.getRootPageId();
+    }
+
     public void close(Session session) throws SQLException {
         synchronized (sync) {
             base.close(session);

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

@@ -1168,7 +1168,7 @@ public class PageStore implements CacheWriter {
 
     private void removeMeta(int logPos, Row row) throws SQLException {
         int id = row.getValue(0).getInt();
-        PageIndex index = (PageIndex) metaObjects.get(id);
+        Index index = metaObjects.get(id);
         int rootPageId = index.getRootPageId();
         index.getTable().removeIndex(index);
         if (index instanceof PageBtreeIndex) {