commit 30e870d6ad67b8a8d48e58372eebe9519cbbb55d
author Edwin Kempin <edwin.kempin@sap.com> Tue Oct 29 05:54:14 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 29 05:54:14 2013 +0000
tree 18fcf5d3885eef5d03986c65c4c43eefd45a0caa
parent 9eec33d1a02fcaaade13df4b42b3233f88675121
parent 9ffc85fd4eab784dfc09f8803c89d99a1889d488

Merge "Fix displaying of the branch-network"

src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
index 2145ac8..50ee03a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
@@ -16,6 +16,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
+import java.net.URL;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -63,7 +64,7 @@
       canonicalWebUrl += "/";
     }
     this.canonicalPath =
-        String.format("%splugins/%s/", canonicalWebUrl, pluginName);
+        String.format("%splugins/%s/", (new URL(canonicalWebUrl)).getPath(), pluginName);
     this.projectControl = projectControl;
     this.repoManager = repoManager;
     this.gitWebConfig = gitWebConfig;