When calling SHUTDOWN IMMEDIATELY in the server mode, the .trace.db file was not closed.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>DatabaseMetaData.getPrimaryKeys: the wrong constraint name was reported
+<ul><li>When calling SHUTDOWN IMMEDIATELY in the server mode, the .trace.db file was not closed.
+</li><li>DatabaseMetaData.getPrimaryKeys: the wrong constraint name was reported
     if there was another constraint on the same table and columns.
 </li><li>AUTO_INCREMENT now works in the same way in ALTER TABLE ALTER COLUMN 
     as in CREATE TABLE (it does not create a primary key).

h2/src/main/org/h2/server/TcpServerThread.java

@@ -153,6 +153,10 @@ public class TcpServerThread implements Runnable {
             try {
                 Command rollback = session.prepareLocal("ROLLBACK");
                 rollback.executeUpdate();
+            } catch (Exception e) {
+                server.traceError(e);
+            }
+            try {
                 session.close();
                 server.removeConnection(id);
             } catch (Exception e) {

h2/src/test/org/h2/test/jdbc/TestDatabaseEventListener.java

@@ -50,8 +50,10 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         Properties p = new Properties();
         p.setProperty("user", user);
         p.setProperty("password", password);
-        Connection conn = DriverManager.getConnection(url, p);
-        Statement stat = conn.createStatement();
+        Connection conn;
+        Statement stat;
+        conn = DriverManager.getConnection(url, p);
+        stat = conn.createStatement();
         // the old.id index head is at position 0
         stat.execute("create table old(id identity) as select 1");
         // the test.id index head is at position 1