Merge pull request #817 from katzyn/misc

Parse also 1 as true and 0 as false in Utils.parseBoolean()

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

@@ -334,15 +334,7 @@ public class ConnectionInfo implements Cloneable {
      * @return the value
      */
     boolean getProperty(String key, boolean defaultValue) {
-        String x = getProperty(key, null);
-        if (x == null) {
-            return defaultValue;
-        }
-        // support 0 / 1 (like the parser)
-        if (x.length() == 1 && Character.isDigit(x.charAt(0))) {
-            return Integer.parseInt(x) != 0;
-        }
-        return Boolean.parseBoolean(x);
+        return Utils.parseBoolean(getProperty(key, null), defaultValue, false);
     }
 
     /**

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

@@ -659,10 +659,10 @@ public class Utils {
         if (value == null) {
             return defaultValue;
         }
-        if (value.equalsIgnoreCase("true")) {
+        if (value.equalsIgnoreCase("true") || value.equals("1")) {
             return true;
         }
-        if (value.equalsIgnoreCase("false")) {
+        if (value.equalsIgnoreCase("false") || value.equals("0")) {
             return false;
         }
         if (throwException) {