Improve code coverage.

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

@@ -94,7 +94,7 @@ class WebThread extends WebApp implements Runnable {
                     break;
                 }
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             TraceSystem.traceThrowable(e);
         }
         IOUtils.closeSilently(output);

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

@@ -386,7 +386,7 @@ public class Shell extends Tool implements Runnable {
         }
         println("[Enter]   " + url);
         print("URL       ");
-        url = readLine(url);
+        url = readLine(url).trim();
         if (driver == null) {
             driver = JdbcUtils.getDriver(url);
         }
@@ -394,7 +394,7 @@ public class Shell extends Tool implements Runnable {
             println("[Enter]   " + driver);
         }
         print("Driver    ");
-        driver = readLine(driver);
+        driver = readLine(driver).trim();
         println("[Enter]   " + user);
         print("User      ");
         user = readLine(user);

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

@@ -136,7 +136,9 @@ public class TestShell extends TestBase {
         read("(1 row,");
         testOut.println("select error;");
         read("sql> Error:");
-        read("select error");
+        if (read("").startsWith("Column \"ERROR\" not found")) {
+            read("");
+        }
         testOut.println("create table test(id int primary key, name varchar)\n;");
         read("sql> ...>");
         testOut.println("show public");