Merge "Make plugin servlet's context path authorization aware" into stable-2.6
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 a196b07..4428034 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.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 @@
}
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 @@
}
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 24e527dc..6facf73 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 @@
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 c4b4b41..9ba3677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,7 +594,7 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.44-1</version>
+ <version>0.1.50</version>
</dependency>
<dependency>
