The DbStarter now closes all connections to the configured database

h2/src/main/org/h2/server/web/DbStarter.java

@@ -69,14 +69,20 @@ public class DbStarter implements ServletContextListener {
     }
 
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
-        if (server != null) {
-            server.stop();
-            server = null;
+        try {
+            conn.createStatement().execute("SHUTDOWN");
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         try {
             conn.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if (server != null) {
+            server.stop();
+            server = null;
         }
+    }
+
 }

h2/src/main/org/h2/server/web/WebSession.java

@@ -234,6 +234,10 @@ class WebSession {
         return shutdownServerOnDisconnect;
     }
 
+    /**
+     * Close the connection and stop the statement if one is currently
+     * executing.
+     */
     void close() {
         if (executingStatement != null) {
             try {