Server.createTcpServer, createPgServer, createWebServer: invalid arguments are now detected.

h2/src/main/org/h2/tools/Console.java

@@ -254,7 +254,7 @@ ShutdownHandler {
         // start browser in any case (even if the server is already running)
         // because some people don't look at the output,
         // but are wondering why nothing happens
-        if (browserStart) {
+        if (browserStart && web != null) {
             openBrowser(web.getURL());
         }
 

h2/src/main/org/h2/tools/Server.java

@@ -171,6 +171,22 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                 } else {
                     throwUnsupportedOption(arg);
                 }
+            } else if (arg.startsWith("-ftp")) {
+                if ("-ftpPort".equals(arg)) {
+                    i++;
+                } else if ("-ftpDir".equals(arg)) {
+                    i++;
+                } else if ("-ftpRead".equals(arg)) {
+                    i++;
+                } else if ("-ftpWrite".equals(arg)) {
+                    i++;
+                } else if ("-ftpWritePassword".equals(arg)) {
+                    i++;
+                } else if ("-ftpTask".equals(arg)) {
+                    // no parameters
+                } else {
+                    throwUnsupportedOption(arg);
+                }
             } else if ("-properties".equals(arg)) {
                 i++;
             } else if ("-trace".equals(arg)) {
@@ -179,6 +195,10 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                 // no parameters
             } else if ("-baseDir".equals(arg)) {
                 i++;
+            } else if ("-key".equals(arg)) {
+                i += 2;
+            } else if ("-tool".equals(arg)) {
+                // no parameters
             } else {
                 throwUnsupportedOption(arg);
             }
@@ -261,6 +281,8 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                 // no parameters
             } else if ("-baseDir".equals(arg)) {
                 i++;
+            } else if ("-key".equals(arg)) {
+                i += 2;
             } else {
                 showUsageAndThrowUnsupportedOption(arg);
             }

h2/src/main/org/h2/util/Tool.java

@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.sql.SQLException;
 import java.util.Properties;
+import org.h2.constant.ErrorCode;
 import org.h2.message.DbException;
 import org.h2.store.FileLister;
 import org.h2.store.fs.FileUtils;
@@ -62,7 +63,7 @@ public abstract class Tool {
      * @return this method never returns normally
      */
     protected SQLException throwUnsupportedOption(String option) throws SQLException {
-        throw new SQLException("Unsupported option: " + option);
+        throw DbException.get(ErrorCode.FEATURE_NOT_SUPPORTED_1, option).getSQLException();
     }
 
     /**

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

@@ -448,7 +448,7 @@ public class TestTools extends TestBase {
 
         result = runServer(1, new String[]{"-xy"});
         assertTrue(result.indexOf("Starts the H2 Console") >= 0);
-        assertTrue(result.indexOf("Unsupported option") >= 0);
+        assertTrue(result.indexOf("Feature not supported") >= 0);
         result = runServer(0, new String[]{"-tcp", "-tcpPort", "9001", "-tcpPassword", "abc"});
         assertTrue(result.indexOf("tcp://") >= 0);
         assertTrue(result.indexOf(":9001") >= 0);