[FIXED JENKINS-12544] Illegal directory name on Windows when port num…

…ber used in URL.
jenkinsci · May 1, 2012 · fd76cf1 · fd76cf1
1 parent 56cba93
commit fd76cf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/mercurial/Cache.java b/src/main/java/hudson/plugins/mercurial/Cache.java
@@ -174,7 +174,7 @@ static String hashSource(String source) {
         if (!source.endsWith("/")) {
             source += "/";
         }
-        Matcher m = Pattern.compile(".+[/]([^/]+)[/]?").matcher(source);
+        Matcher m = Pattern.compile(".+[/]([^/:]+)(:\\d+)?[/]?").matcher(source);
         BigInteger hash;
         try {
             hash = new BigInteger(1, MessageDigest.getInstance("SHA-1").digest(source.getBytes("UTF-8")));

diff --git a/src/test/java/hudson/plugins/mercurial/CacheTest.java b/src/test/java/hudson/plugins/mercurial/CacheTest.java
@@ -1,6 +1,7 @@
 package hudson.plugins.mercurial;
 
 import junit.framework.TestCase;
+import org.jvnet.hudson.test.Bug;
 
 public class CacheTest extends TestCase {
 
@@ -15,4 +16,9 @@ public void testHashSource() throws Exception {
         assertEquals("210ED9E2610F74A473985D8D9EF4483D5D30265E-project", Cache.hashSource("ssh://dudette@math.utexas.edu/some/project/"));
     }
 
+    @Bug(12544)
+    public void testHashSource2() throws Exception {
+        assertEquals("DA7E6A4632009859A61A551999EE2109EBB69267-ronaldradial", Cache.hashSource("http://ronaldradial:8000/"));
+    }
+
 }