Issue 464: [MVStore] org.h2.mvstore.db.MVTable throws java.lang.NullPointerException

h2/src/docsrc/html/changelog.html

@@ -23,7 +23,7 @@ Change Log
     in a strange exception of the type "column x must be included in the group by list".
 </li><li>Issue 454: Use Charset for type-safety.
 </li><li>Queries with both LIMIT and OFFSET could throw an IllegalArgumentException.
-</li><li>MVStore: multiple issues were fixed: 460, 461, 462.
+</li><li>MVStore: multiple issues were fixed: 460, 461, 462, 464.
 </li><li>MVStore: larger stores (multiple GB) are now much faster.
 </li><li>When using local temporary tables and not dropping them manually before closing the session,
     and then killing the process could result in a database that couldn't be opened (except when using

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

@@ -642,6 +642,7 @@ public class MVTable extends TableBase {
         }
         primaryIndex.remove(session);
         database.removeMeta(session, getId());
+        database.getMvStore().removeTable(this);
         primaryIndex = null;
         close(session);
         invalidate();

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

@@ -101,6 +101,10 @@ public class MVTableEngine implements TableEngine {
             return openTables;
         }
         
+        public void removeTable(MVTable table) {
+            openTables.remove(table);
+        }
+
         /**
          * Store all pending changes.
          */

h2/src/main/org/h2/value/ValueLob.java

@@ -476,6 +476,7 @@ public class ValueLob extends Value {
         if (fileName != null) {
             if (tempFile != null) {
                 tempFile.stopAutoDelete();
+                tempFile = null;
             }
             deleteFile(handler, fileName);
         }

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -114,6 +114,7 @@ int test;
         Statement stat;
         ResultSet rs;
         conn = getConnection("mvstore");
+        for (int i = 0; i < 2; i++) {
             stat = conn.createStatement();
             stat.execute("create table test(id int primary key, name varchar) "
                     + "engine \"org.h2.mvstore.db.MVTableEngine\"");
@@ -135,6 +136,8 @@ int test;
             rs = stat.executeQuery("select count(*) from test");
             rs.next();
             assertEquals(1, rs.getInt(1));
+            stat.execute("drop table test");
+        }
 
         conn.close();
     }