When using AUTO_SERVER=TRUE, the server is now started as a daemon thread.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>H2 Console: the built-in commands are now documented.
+<ul><li>When using AUTO_SERVER=TRUE, the server is now started as a daemon thread.
+    This was a problem when using Tomcat and a connection pool.
+</li><li>Servers can now be started as a daemon thread using the command line options
+    -tcpDaemon, -pgDaemon, and -webDaemon.
+</li><li>H2 Console: the built-in commands are now documented.
 </li><li>REPLACE: if any parameter is null, the result is null.
 </li><li>Queries with DISTINCT and ORDER BY will now use the index on ORDER BY if possible.
     This is specially important for queries used inside IN(SELECT ...).

h2/src/docsrc/html/features.html

@@ -1122,7 +1122,7 @@ You can use the same database URL no matter if the database is already open or n
 </p>
 <p>
 When using this mode, the first connection to the database is made in embedded mode,
-and additionally a server is started internally.
+and additionally a server is started internally (as a daemon thread).
 If the database is already open in another process, the server mode is used automatically.
 </p>
 <p>

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

@@ -602,6 +602,7 @@ public class Database implements DataHandler {
             server = Server.createTcpServer(
                     "-tcpPort", "0",
                     "-tcpAllowOthers",
+                    "-tcpDaemon",
                     "-key", key, databaseName);
             server.start();
         } catch (SQLException e) {