TCP and PG server: if the default port is already in use, the services are now…

TCP and PG server: if the default port is already in use, the services are now started on another free port (unless the port is explicitly set). This allows to start the H2 Console even if the TCP or PG servers are already running.

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

@@ -54,6 +54,7 @@ public class TcpServer implements Service {
     private static final Map<Integer, TcpServer> SERVERS = Collections.synchronizedMap(new HashMap<Integer, TcpServer>());
 
     private int port;
+    private boolean portIsSet;
     private boolean trace;
     private boolean ssl;
     private boolean stop;
@@ -169,6 +170,7 @@ public class TcpServer implements Service {
                 ssl = true;
             } else if (Tool.isOption(a, "-tcpPort")) {
                 port = Integer.decode(args[++i]);
+                portIsSet = true;
             } else if (Tool.isOption(a, "-tcpPassword")) {
                 managementPassword = args[++i];
             } else if (Tool.isOption(a, "-baseDir")) {
@@ -216,7 +218,15 @@ public class TcpServer implements Service {
 
     public synchronized void start() throws SQLException {
         stop = false;
-        serverSocket = NetUtils.createServerSocket(port, ssl);
+        try {
+            serverSocket = NetUtils.createServerSocket(port, ssl);
+        } catch (DbException e) {
+            if (!portIsSet) {
+                serverSocket = NetUtils.createServerSocket(0, ssl);
+            } else {
+                throw e;
+            }
+        }
         port = serverSocket.getLocalPort();
         initManagementDb();
     }

h2/src/main/org/h2/server/pg/PgServer.java

@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import org.h2.engine.Constants;
+import org.h2.message.DbException;
 import org.h2.server.Service;
 import org.h2.util.NetUtils;
 import org.h2.util.New;
@@ -72,6 +73,7 @@ public class PgServer implements Service {
     private HashSet<Integer> typeSet = New.hashSet();
 
     private int port = PgServer.DEFAULT_PORT;
+    private boolean portIsSet;
     private boolean stop;
     private boolean trace;
     private ServerSocket serverSocket;
@@ -89,6 +91,7 @@ public class PgServer implements Service {
                 trace = true;
             } else if (Tool.isOption(a, "-pgPort")) {
                 port = Integer.decode(args[++i]);
+                portIsSet = true;
             } else if (Tool.isOption(a, "-baseDir")) {
                 baseDir = args[++i];
             } else if (Tool.isOption(a, "-pgAllowOthers")) {
@@ -160,7 +163,16 @@ public class PgServer implements Service {
     }
 
     public void start() {
-        serverSocket = NetUtils.createServerSocket(port, false);
+        try {
+            serverSocket = NetUtils.createServerSocket(port, false);
+        } catch (DbException e) {
+            if (!portIsSet) {
+                serverSocket = NetUtils.createServerSocket(0, false);
+            } else {
+                throw e;
+            }
+        }
+        port = serverSocket.getLocalPort();
     }
 
     public void listen() {

h2/src/test/org/h2/test/unit/TestTools.java

@@ -73,6 +73,7 @@ public class TestTools extends TestBase {
             return;
         }
         org.h2.Driver.load();
+        testTcpServerWithoutPort();
         testConsole();
         testJdbcDriverUtils();
         testWrongServer();
@@ -99,6 +100,23 @@ public class TestTools extends TestBase {
         IOUtils.delete(getBaseDir() + "/b2.zip");
     }
 
+    private void testTcpServerWithoutPort() throws Exception {
+        Server s1 = Server.createTcpServer().start();
+        Server s2 = Server.createTcpServer().start();
+        assertTrue(s1.getPort() != s2.getPort());
+        s1.stop();
+        s2.stop();
+        s1 = Server.createTcpServer("-tcpPort", "9123").start();
+        assertEquals(9123, s1.getPort());
+        try {
+            s2 = Server.createTcpServer("-tcpPort", "9123").start();
+            fail();
+        } catch (SQLException e) {
+            assertEquals(ErrorCode.EXCEPTION_OPENING_PORT_2, e.getErrorCode());
+        }
+        s1.stop();
+    }
+
     private void testConsole() throws Exception {
         String old = System.getProperty(SysProperties.H2_BROWSER);
         Console c = new Console();