Issue 609: the spatial index did not support NULL.

h2/src/main/org/h2/mvstore/rtree/SpatialDataType.java

@@ -83,6 +83,10 @@ public class SpatialDataType implements DataType {
 
     @Override
     public void write(WriteBuffer buff, Object obj) {
+        if (obj == null) {
+            buff.putVarInt(-1);
+            return;
+        }
         SpatialKey k = (SpatialKey) obj;
         int flags = 0;
         for (int i = 0; i < dimensions; i++) {
@@ -103,6 +107,9 @@ public class SpatialDataType implements DataType {
     @Override
     public Object read(ByteBuffer buff) {
         int flags = DataUtils.readVarInt(buff);
+        if (flags == -1) {
+            return null;
+        }
         float[] minMax = new float[dimensions * 2];
         for (int i = 0; i < dimensions; i++) {
             float min = buff.getFloat();

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

@@ -924,8 +924,17 @@ public class TestSpatial extends TestBase {
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
         assertNull(rs.getObject(2));
-        stat.execute("drop table test");
         conn.close();
+        if (!config.memory) {
+            conn = getConnection(url);
+            stat = conn.createStatement();
+            rs = stat.executeQuery("select * from test");
+            assertTrue(rs.next());
+            assertEquals(1, rs.getInt(1));
+            assertNull(rs.getObject(2));
+            conn.close();
+        }
+
         deleteDb("spatial");
     }