Database file lock: the exception "lock file modified in the future" is longer thrown.

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

@@ -262,9 +262,14 @@ public class FileLock {
             long last = fs.getLastModified(fileName);
             long dist = System.currentTimeMillis() - last;
             if (dist < -TIME_GRANULARITY) {
-                throw getExceptionFatal("Lock file modification time is in the future; " +
-                        "if required please delete the file " + fileName + " manually and retry; " +
-                        "dist=" + dist, null);
+                // lock file modified in the future -
+                // wait for a bit longer than usual
+                try {
+                    Thread.sleep(2 * sleep);
+                } catch (Exception e) {
+                    trace.debug("sleep", e);
+                }
+                return;
             } else if (dist > TIME_GRANULARITY) {
                 return;
             }

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

@@ -46,11 +46,22 @@ public class TestFileLock extends TestBase implements Runnable {
     }
 
     public void test() throws Exception {
+        testFutureModificationDate();
         testSimple();
         test(false);
         test(true);
     }
 
+    private void testFutureModificationDate() throws Exception {
+        File f = new File(FILE);
+        f.delete();
+        f.createNewFile();
+        f.setLastModified(System.currentTimeMillis() + 10000);
+        FileLock lock = new FileLock(new TraceSystem(null, false), FILE, Constants.LOCK_SLEEP);
+        lock.lock(FileLock.LOCK_FILE);
+        lock.unlock();
+    }
+
     private void testSimple() throws SQLException {
         FileLock lock1 = new FileLock(new TraceSystem(null, false), FILE, Constants.LOCK_SLEEP);
         FileLock lock2 = new FileLock(new TraceSystem(null, false), FILE, Constants.LOCK_SLEEP);