New system property h2.maxReconnect.

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

@@ -1027,7 +1027,11 @@ public class Database implements DataHandler {
      *            hook
      */
     synchronized void close(boolean fromShutdownHook) {
+        if (closing) {
+            return;
+        }
         closing = true;
+        stopServer();
         if (userSessions.size() > 0) {
             if (!fromShutdownHook) {
                 return;
@@ -1061,7 +1065,6 @@ public class Database implements DataHandler {
             }
             closing = true;
         }
-        stopServer();
         try {
             if (systemSession != null) {
                 ObjectArray tablesAndViews = getAllSchemaObjects(DbObject.TABLE_OR_VIEW);
@@ -2078,5 +2081,9 @@ public class Database implements DataHandler {
         }
         return TableLinkConnection.open(linkConnections, driver, url, user, password);
     }
+    
+    public String toString() {
+        return databaseShortName + ":" + super.toString();
+    }
 
 }

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

@@ -154,6 +154,15 @@ public class Session implements SessionInterface {
         Value v = (Value) variables.get(name);
         return v == null ? ValueNull.INSTANCE : v;
     }
+    
+    public String[] getVariableNames() {
+        if (variables == null) {
+            return new String[0];
+        }
+        String[] list = new String[variables.size()];
+        variables.keySet().toArray(list);
+        return list;
+    }
 
     /**
      * Get the local temporary table if one exists with that name, or null if

h2/src/test/org/h2/test/server/TestAutoReconnect.java

@@ -62,8 +62,8 @@ public class TestAutoReconnect extends TestBase {
                 "AUTO_SERVER=TRUE;OPEN_NEW=TRUE";
             restart();
         } else {
-            server = Server.createTcpServer(null).start();
-            url = "jdbc:h2:tcp://localhost/" + baseDir + "/autoReconnect;" + 
+            server = Server.createTcpServer(new String[]{"-tcpPort", "8181"}).start();
+            url = "jdbc:h2:tcp://localhost:8181/" + baseDir + "/autoReconnect;" + 
                 "FILE_LOCK=SOCKET;AUTO_RECONNECT=TRUE";
         }
         Connection conn = DriverManager.getConnection(url);

h2/src/test/org/h2/test/server/TestAutoServer.java

@@ -62,14 +62,15 @@ public class TestAutoServer extends TestBase {
         
         Connection conn = getConnection(url + ";OPEN_NEW=TRUE");
         Statement stat = conn.createStatement();
-        try {
-            stat.execute("SHUTDOWN");
-        } catch (SQLException e) {
-            assertKnownException(e);
-            // the connection is closed
+        if (config.big) {
+            try {
+                stat.execute("SHUTDOWN");
+            } catch (SQLException e) {
+                assertKnownException(e);
+                // the connection is closed
+            }
         }
         conn.close();
-        
         connServer.close();
     }