commit ee1fde5c58c6b3059c218084f3e80588fb5473e3
author David Pursehouse <dpursehouse@collab.net> Thu Nov 15 01:50:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 15 01:50:50 2018 +0000
tree 352455c271edc7c14deb9a09a17631ffabfc9728
parent 6a097909bce51c35a30b2c64764ff5d09a023a35
parent 72d8b133e1b2557e49327432c6155ddb88aa800e

Merge "Fix running Gerrit on Tomcat" into stable-2.16

java/com/google/gerrit/sshd/AbstractGitCommand.java

diff --git a/java/com/google/gerrit/sshd/AbstractGitCommand.java b/java/com/google/gerrit/sshd/AbstractGitCommand.java
index 5370c9e..921b416 100644
--- a/java/com/google/gerrit/sshd/AbstractGitCommand.java
+++ b/java/com/google/gerrit/sshd/AbstractGitCommand.java
@@ -47,11 +47,15 @@
   protected Repository repo;
   protected Project.NameKey projectName;
   protected Project project;
-  protected String gitProtocol;
+  protected String[] extraParameters;
 
   @Override
   public void start(Environment env) {
-    gitProtocol = env.getEnv().get(GIT_PROTOCOL);
+    String gitProtocol = env.getEnv().get(GIT_PROTOCOL);
+    if (gitProtocol != null) {
+      extraParameters = gitProtocol.split(":");
+    }
+
     Context ctx = context.subContext(newSession(), context.getCommandLine());
     final Context old = sshScope.set(ctx);
     try {

java/com/google/gerrit/sshd/commands/Upload.java

diff --git a/java/com/google/gerrit/sshd/commands/Upload.java b/java/com/google/gerrit/sshd/commands/Upload.java
index c5ffc16..cb5d449 100644
--- a/java/com/google/gerrit/sshd/commands/Upload.java
+++ b/java/com/google/gerrit/sshd/commands/Upload.java
@@ -65,8 +65,8 @@
     up.setPackConfig(config.getPackConfig());
     up.setTimeout(config.getTimeout());
     up.setPostUploadHook(PostUploadHookChain.newChain(Lists.newArrayList(postUploadHooks)));
-    if (config.enableProtocolV2() && gitProtocol != null) {
-      up.setExtraParameters(ImmutableList.of(gitProtocol));
+    if (config.enableProtocolV2() && extraParameters != null) {
+      up.setExtraParameters(ImmutableList.copyOf(extraParameters));
     }
 
     List<PreUploadHook> allPreUploadHooks = Lists.newArrayList(preUploadHooks);