Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Bump JSch to 1.5.0 to fix Java7 compatibility
  Extend AddBranchResult with toString method implementation
  Get rid of JdbcSQLException while numbers are read from cache

3 files changed, 17 insertions, 3 deletions

diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
index a196b07054..4428034817 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
@@ -27,6 +27,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -267,7 +268,7 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> {
     }
 
     void set(PreparedStatement ps, int col, K value) throws SQLException {
-      ps.setObject(col, value);
+      ps.setObject(col, value, Types.JAVA_OBJECT);
     }
 
     Funnel<K> funnel() {
@@ -488,7 +489,7 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> {
         }
         try {
           keyType.set(c.put, 1, key);
-          c.put.setObject(2, holder.value);
+          c.put.setObject(2, holder.value, Types.JAVA_OBJECT);
           c.put.setTimestamp(3, new Timestamp(holder.created));
           c.put.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
           c.put.executeUpdate();
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java
index 24e527dce8..6facf73a44 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java
@@ -41,6 +41,19 @@ public class AddBranchResult {
     return error;
   }
 
+  @Override
+  public String toString() {
+    if (hasError()) {
+      return getError().toString();
+    }
+    if (getListBranchesResult() != null) {
+      return "succeed, no repository: "
+          + getListBranchesResult().getNoRepository() + ", can add: "
+          + getListBranchesResult().getCanAdd();
+    }
+    return "succeed";
+  }
+
   public static class Error {
     public static enum Type {
       /** The branch cannot be created because the given branch name is invalid. */
diff --git a/pom.xml b/pom.xml
index 11d24b2a08..a206560372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -582,7 +582,7 @@ limitations under the License.
       <dependency>
         <groupId>com.jcraft</groupId>
         <artifactId>jsch</artifactId>
-        <version>0.1.44-1</version>
+        <version>0.1.50</version>
       </dependency>
 
       <dependency>