Auto-Reconnect

h2/src/main/org/h2/engine/Database.java

@@ -394,7 +394,10 @@ public class Database implements DataHandler {
                 }
                 if (lock != null) {
                     stopServer();
-                    lock.unlock();
+                    if (lockMode != FileLock.LOCK_SERIALIZED) {
+                        // allow testing shutdown
+                        lock.unlock();
+                    }
                     lock = null;
                 }
             } catch (Exception e) {

h2/src/main/org/h2/message/TraceObject.java

@@ -130,6 +130,15 @@ public class TraceObject {
         this.id = id;
     }
 
+    /**
+     * Update the trace.
+     *
+     * @param trace the trace object
+     */
+    protected void setTrace(Trace trace) {
+        this.trace = trace;
+    }
+
     /**
      * INTERNAL
      */

h2/src/main/org/h2/util/SortedProperties.java

@@ -74,11 +74,14 @@ public class SortedProperties extends Properties {
     public static synchronized SortedProperties loadProperties(String fileName) throws IOException {
         SortedProperties prop = new SortedProperties();
         if (FileUtils.exists(fileName)) {
-            InputStream in = FileUtils.openFileInputStream(fileName);
+            InputStream in = null;
             try {
+                in = FileUtils.openFileInputStream(fileName);
                 prop.load(in);
             } finally {
-                in.close();
+                if (in != null) {
+                    in.close();
+                }
             }
         }
         return prop;