commit ff0c6367be2aabe518705848753598cbb71e71f4
author Edwin Kempin <edwin.kempin@gmail.com> Tue Apr 07 10:29:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 10:29:13 2015 +0000
tree aa987953cafca2488d20b74e1464ff009b84ca2c
parent 93c07ebab51af8d4c537ef5d685a39207dcd5e93
parent 1cdf381e7b01063ecfc6445f6197950595dc5f0c

Merge "Update 2.11 release notes" into stable-2.11

gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
index 97de6b5..e73f805 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
@@ -63,6 +63,8 @@
 import org.eclipse.jgit.transport.resolver.UploadPackFactory;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -156,6 +158,13 @@
     public Repository open(HttpServletRequest req, String projectName)
         throws RepositoryNotFoundException, ServiceNotAuthorizedException,
         ServiceNotEnabledException {
+      try {
+        // TODO: remove this code when Guice fixes its issue 745
+        projectName = URLDecoder.decode(projectName, "UTF-8");
+      } catch (UnsupportedEncodingException e) {
+        // leave it encoded
+      }
+
       while (projectName.endsWith("/")) {
         projectName = projectName.substring(0, projectName.length() - 1);
       }