Improved compatibility with the Java 7 FileSystem abstraction.

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

@@ -431,7 +431,7 @@ public class FileStore {
      */
     public void sync() {
         try {
-            file.sync();
+            file.force(true);
         } catch (IOException e) {
             throw DbException.convertIOException(e, name);
         }

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

@@ -58,9 +58,11 @@ public interface FileObject {
     long position() throws IOException;
 
     /**
-     * Force changes to the physical location.
+     * Force changes to the physical location (sync).
+     *
+     * @param metaData whether the file metadata should be written as well
      */
-    void sync() throws IOException;
+    void force(boolean metaData) throws IOException;
 
     /**
      * Change the length of the file.

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

@@ -25,7 +25,7 @@ public class FileObjectDisk implements FileObject {
         this.name = fileName;
     }
 
-    public void sync() throws IOException {
+    public void force(boolean metaData) throws IOException {
         String m = SysProperties.SYNC_METHOD;
         if ("".equals(m)) {
             // do nothing

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

@@ -57,7 +57,7 @@ public class FileObjectMem implements FileObject {
         pos = 0;
     }
 
-    public void sync() {
+    public void force(boolean metaData) throws IOException {
         // do nothing
     }
 

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

@@ -78,8 +78,8 @@ public class FileObjectNio implements FileObject {
         length = newLength;
     }
 
-    public void sync() throws IOException {
-        channel.force(true);
+    public void force(boolean metaData) throws IOException {
+        channel.force(metaData);
     }
 
     public void write(byte[] b, int off, int len) throws IOException {

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

@@ -186,7 +186,7 @@ public class FileObjectNioMapped implements FileObject {
         pos = (int) Math.min(newLength, oldPos);
     }
 
-    public synchronized void sync() throws IOException {
+    public void force(boolean metaData) throws IOException {
         mapped.force();
         file.getFD().sync();
     }

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

@@ -49,8 +49,8 @@ public class FileObjectRec implements FileObject {
         file.truncate(newLength);
     }
 
-    public void sync() throws IOException {
-        file.sync();
+    public void force(boolean metaData) throws IOException {
+        file.force(metaData);
     }
 
     public void write(byte[] b, int off, int len) throws IOException {

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

@@ -114,9 +114,9 @@ public class FileObjectSplit implements FileObject {
         this.length = newLength;
     }
 
-    public void sync() throws IOException {
+    public void force(boolean metaData) throws IOException {
         for (FileObject f : list) {
-            f.sync();
+            f.force(metaData);
         }
     }
 

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

@@ -96,7 +96,7 @@ public class FileObjectZip implements FileObject {
         throw new IOException("File is read-only");
     }
 
-    public void sync() {
+    public void force(boolean metaData) throws IOException {
         // nothing to do
     }
 

h2/src/test/org/h2/test/unit/TestFileSystem.java

@@ -316,7 +316,7 @@ public class TestFileSystem extends TestBase {
         FileUtils.delete(s);
         FileObject f = FileUtils.openFileObject(s, "rw");
         assertThrows(EOFException.class, f).readFully(new byte[1], 0, 1);
-        f.sync();
+        f.force(true);
         Random random = new Random(seed);
         int size = getSize(100, 500);
         try {

h2/src/test/org/h2/test/utils/FileDebug.java

@@ -56,9 +56,9 @@ public class FileDebug implements FileObject {
         file.truncate(newLength);
     }
 
-    public void sync() throws IOException {
-        debug("sync");
-        file.sync();
+    public void force(boolean metaData) throws IOException {
+        debug("force");
+        file.force(metaData);
     }
 
     public void write(byte[] b, int off, int len) throws IOException {

h2/src/tools/org/h2/dev/fs/FileObjectCrypt.java

@@ -85,8 +85,8 @@ public class FileObjectCrypt implements FileObject {
         file.position(pos + HEADER_LENGTH);
     }
 
-    public void sync() throws IOException {
-        file.sync();
+    public void force(boolean metaData) throws IOException {
+        file.force(metaData);
     }
 
     public FileLock tryLock() throws IOException {

h2/src/tools/org/h2/dev/fs/FileObjectZip2.java

@@ -102,7 +102,7 @@ public class FileObjectZip2 implements FileObject {
         throw new IOException("File is read-only");
     }
 
-    public void sync() {
+    public void force(boolean metaData) throws IOException {
         // nothing to do
     }