The file lock thread is now stopped when the database is closed.

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

@@ -159,11 +159,19 @@ public class FileLock {
             }
         } catch (Exception e) {
             trace.debug("unlock", e);
-        }
+        } finally {
             fileName = null;
             socket = null;
             locked = false;
         }
+        try {
+            if (watchdog != null) {
+                watchdog.interrupt();
+            }
+        } catch (Exception e) {
+            trace.debug("unlock", e);
+        }
+    }
 
     /**
      * Add or change a setting to the properties. This call does not save the
@@ -347,6 +355,10 @@ public class FileLock {
                             Thread.sleep(sleep);
                         } catch (OutOfMemoryError e) {
                             // ignore
+                        } catch (InterruptedException e) {
+                            // ignore
+                        } catch (NullPointerException e) {
+                            // ignore
                         } catch (Exception e) {
                             trace.debug("watchdog", e);
                         }