Documentation / formatting

h2/src/main/org/h2/mvstore/MVStore.java

@@ -44,8 +44,10 @@ TransactionStore:
 
 MVStore:
 - better and clearer memory usage accounting rules
-    (heap memory versus disk memory), so that even there is never an out of memory
-    even for a small heap, and so that chunks are still relatively big on average
+    (heap memory versus disk memory), so that even there is
+    never an out of memory
+    even for a small heap, and so that chunks
+    are still relatively big on average
 - make sure serialization / deserialization errors don't corrupt the file
 - FileStore: don't open and close when set using MVStore.Builder.fileStore
 - test and possibly improve compact operation (for large dbs)
@@ -273,7 +275,7 @@ public class MVStore {
     private long autoCompactLastFileOpCount;
 
     private Object compactSync = new Object();
-    
+
     private IllegalStateException panicException;
 
     /**
@@ -797,7 +799,7 @@ public class MVStore {
         }
         closeStore(true);
     }
-    
+
     /**
      * Close the file and the store, without writing anything. This will stop
      * the background thread. This method ignores all errors.

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

@@ -100,7 +100,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         deleteDb("functions");
         FileUtils.deleteRecursive(TEMP_DIR, true);
     }
-    
+
     private void testDataType() throws SQLException {
         Connection conn = getConnection("functions");
         Statement stat = conn.createStatement();

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

@@ -889,7 +889,7 @@ public class TestMVStore extends TestBase {
         MVMap<Integer, Integer> map = s.openMap("test");
         map.put(10, 100);
         // ensure the file header is overwritten
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 30; i++) {
             if (i > 5) {
                 s.setRetentionTime(0);
             }
@@ -898,7 +898,9 @@ public class TestMVStore extends TestBase {
         }
         s.close();
         s = openStore(fileName);
-        assertEquals("123", s.getStoreHeader().get("test").toString());
+        Object test = s.getStoreHeader().get("test");
+        assertFalse(test == null);
+        assertEquals("123", test.toString());
         s.close();
     }