Documentation / Tests / Build

h2/src/docsrc/html/changelog.html

@@ -21,8 +21,9 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
-<li>Windows / PageStore storage: the cooperative file locking mechanism
-    did not always work as expected.
+<li>PageStore storage: the cooperative file locking mechanism
+    did not always work as expected (with very slow computers).
+</li>
 <li>Temporary CLOB and BLOB objects are now removed while the database is open
     (and not just when closing the database).
 </li>

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

@@ -2031,26 +2031,30 @@ public class TestMVStore extends TestBase {
         FileUtils.delete(fileName);
         MVStore store = new MVStore.Builder().cacheSize(16).
                 fileName(fileName).open();
-        MVMap<Integer, String> map = store.openMap("test");
-        long last = System.currentTimeMillis();
-        String data = new String(new char[2500]).replace((char) 0, 'x');
-        for (int i = 0;; i++) {
-            map.put(i, data);
-            if (i % 10000 == 0) {
-                store.commit();
-                long time = System.currentTimeMillis();
-                if (time - last > 2000) {
-                    long mb = store.getFileStore().size() / 1024 / 1024;
-                    trace(mb + "/4500");
-                    if (mb > 4500) {
-                        break;
+        try {
+            MVMap<Integer, String> map = store.openMap("test");
+            long last = System.currentTimeMillis();
+            String data = new String(new char[2500]).replace((char) 0, 'x');
+            for (int i = 0;; i++) {
+                map.put(i, data);
+                if (i % 10000 == 0) {
+                    store.commit();
+                    long time = System.currentTimeMillis();
+                    if (time - last > 2000) {
+                        long mb = store.getFileStore().size() / 1024 / 1024;
+                        trace(mb + "/4500");
+                        if (mb > 4500) {
+                            break;
+                        }
+                        last = time;
                     }
-                    last = time;
                 }
             }
+            store.commit();
+            store.close();
+        } finally {
+            store.closeImmediately();
         }
-        store.commit();
-        store.close();
         FileUtils.delete(fileName);
     }
 

h2/src/tools/org/h2/build/code/CheckTextFiles.java

@@ -190,6 +190,9 @@ public class CheckTextFiles {
                     line++;
                     int lineLength = i - startLinePos;
                     if (file.getName().endsWith(".java")) {
+                        if (useCRLF) {
+                            lineLength--;
+                        }
                         if (lineLength > MAX_SOURCE_LINE_SIZE) {
                             fail(file, "line too long: " + lineLength, line);
                         }