StringUtils.convertBytesToHex

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

@@ -286,7 +286,7 @@ public class ConnectionInfo implements Cloneable {
 
     private static byte[] hashPassword(boolean passwordHash, String userName, char[] password) {
         if (passwordHash) {
-            return StringUtils.convertStringToBytes(new String(password));
+            return StringUtils.convertHexToBytes(new String(password));
         }
         if (userName.length() == 0 && password.length == 0 && SysProperties.EMPTY_PASSWORD) {
             return new byte[0];

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

@@ -370,11 +370,9 @@ public class Session extends SessionWithState {
         this.lockTimeout = lockTimeout;
     }
 
-    public CommandInterface prepareCommand(String sql, int fetchSize) {
-        synchronized (database) {
+    public synchronized CommandInterface prepareCommand(String sql, int fetchSize) {
         return prepareLocal(sql);
     }
-    }
 
     /**
      * Parse and prepare the given SQL statement. This method also checks the

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

@@ -158,9 +158,9 @@ public class User extends RightOwner {
         }
         if (password) {
             buff.append(" SALT '").
-                append(StringUtils.convertBytesToString(salt)).
+                append(StringUtils.convertBytesToHex(salt)).
                 append("' HASH '").
-                append(StringUtils.convertBytesToString(passwordHash)).
+                append(StringUtils.convertBytesToHex(passwordHash)).
                 append('\'');
         } else {
             buff.append(" PASSWORD ''");

h2/src/main/org/h2/fulltext/FullText.java

@@ -491,7 +491,7 @@ public class FullText {
         case Types.VARBINARY:
         case Types.LONGVARBINARY:
         case Types.BINARY:
-            return "'" + StringUtils.convertBytesToString((byte[]) data) + "'";
+            return "'" + StringUtils.convertBytesToHex((byte[]) data) + "'";
         case Types.CLOB:
         case Types.JAVA_OBJECT:
         case Types.OTHER: