The wrong error message was thrown when trying to open a database where the…

The wrong error message was thrown when trying to open a database where the database file could not be read for some reason (for example because the split file system was used, and the file was split at the wrong position). 

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

@@ -526,7 +526,9 @@ public class FileStore {
      * Release the file lock.
      */
     public void releaseLock() {
-        file.releaseLock();
+        if (file != null) {
+            file.releaseLock();
+        }
     }
 
 }

h2/src/main/org/h2/store/fs/FileSystemSplit.java

@@ -239,20 +239,27 @@ public class FileSystemSplit extends FileSystem {
                 long l = o.length();
                 length += l;
                 if (l != maxLength) {
-                    throw new IOException("Expected file length: " + maxLength + " got: " + l + " for " + o.getName());
+                    closeAndThrow(array, o, maxLength);
                 }
             }
             o = array[array.length - 1];
             long l = o.length();
             length += l;
             if (l > maxLength) {
-                throw new IOException("Expected file length: " + maxLength + " got: " + l + " for " + o.getName());
+                closeAndThrow(array, o, maxLength);
             }
         }
         FileObjectSplit fo = new FileObjectSplit(fileName, mode, array, length, maxLength);
         return fo;
     }
 
+    private void closeAndThrow(FileObject[] array, FileObject o, long maxLength) throws IOException {
+        for (FileObject f : array) {
+            f.close();
+        }
+        throw new IOException("Expected file length: " + maxLength + " got: " + o.length() + " for " + o.getName());
+    }
+
     public OutputStream openFileOutputStream(String fileName, boolean append) {
         fileName = translateFileName(fileName);
         // TODO the output stream is not split