fixed JENKINS-18283 : Wrong URL in diff

jenkinsci · Jun 14, 2013 · 93e9966 · 93e9966
1 parent 6f5be78
commit 93e9966
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/viewVC/ViewVCRepositoryBrowser.java b/src/main/java/hudson/plugins/viewVC/ViewVCRepositoryBrowser.java
@@ -63,12 +63,22 @@ public URL getUrl() {
 
     @Override
     public URL getDiffLink(Path path) throws IOException {
-		return new URL(getUrl(), String.format(DIFF_FORMAT, path.getValue(), getLocation(), path.getLogEntry().getRevision() - 1, path.getLogEntry().getRevision()));
+        String baseUrl = getUrl().toString();
+        // eliminate trailing slash since the SVN path already has it
+        if (baseUrl.endsWith("/")) {
+            baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+        }
+		return new URL(baseUrl + String.format(DIFF_FORMAT, path.getValue(), getLocation(), path.getLogEntry().getRevision() - 1, path.getLogEntry().getRevision()));
     }
 
     @Override
     public URL getFileLink(Path path) throws IOException {
-    	return new URL(getUrl(), String.format(FILE_FORMAT, path.getValue(), getLocation()));
+        String baseUrl = getUrl().toString();
+        // eliminate trailing slash since the SVN path already has it
+        if (baseUrl.endsWith("/")) {
+            baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+        }
+    	return new URL(baseUrl + String.format(FILE_FORMAT, path.getValue(), getLocation()));
     }
 
     @Override