From 296c78acd6b1584d059bfb22266ab3b1fc73f225 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 3 Dec 2011 16:33:34 +0100
Subject: [PATCH] fix wrong compare urls for github and bitbucket

---
 .../rest/url/AbstractCompareUrlBuilder.java   | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java
index fc2bff9384..0d7c0b4b99 100644
--- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java
+++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java
@@ -99,24 +99,6 @@ public abstract class AbstractCompareUrlBuilder implements CompareUrlBuilder
                             other.getVersion());
   }
 
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param url
-   *
-   * @return
-   */
-  @Override
-  public boolean isCompareable(String url)
-  {
-    return url.contains(getServername());
-  }
-
-  //~--- methods --------------------------------------------------------------
-
   /**
    * Method description
    *
@@ -127,8 +109,8 @@ public abstract class AbstractCompareUrlBuilder implements CompareUrlBuilder
    *
    * @return
    */
-  private String createCompareUrl(String urlString, String version,
-                                  String otherVersion)
+  public String createCompareUrl(String urlString, String version,
+                                 String otherVersion)
   {
     String result = null;
 
@@ -139,6 +121,8 @@ public abstract class AbstractCompareUrlBuilder implements CompareUrlBuilder
 
       if (Util.isNotEmpty(path))
       {
+        path = HttpUtil.getUriWithoutStartSeperator(path);
+
         String[] parts = path.split(HttpUtil.SEPARATOR_PATH);
 
         if (parts.length >= 2)
@@ -155,4 +139,20 @@ public abstract class AbstractCompareUrlBuilder implements CompareUrlBuilder
 
     return result;
   }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   *
+   * @return
+   */
+  @Override
+  public boolean isCompareable(String url)
+  {
+    return url.contains(getServername());
+  }
 }