include leading slash in path when parsing URLs in URLStreamHandler

This matches the behavior of OpenJDK's version.
ReadyTalk · Feb 18, 2012 · 750e5f9 · 750e5f9
1 parent 999e90c
commit 750e5f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/classpath/java/net/URLStreamHandler.java b/classpath/java/net/URLStreamHandler.java
@@ -40,7 +40,7 @@ protected void parseURL(URL url, String s, int start, int end)
           host = s.substring(0, colon);
           port = Integer.parseInt(s.substring(colon + 1), slash);
         }
-        s = s.substring(slash + 1);
+        s = s.substring(slash);
       }
     }
 

diff --git a/test/UrlTest.java b/test/UrlTest.java
@@ -3,7 +3,7 @@
 
 public class UrlTest {
   private static String query="var1=val1&var2=val2";
-  private static String path="testpath";
+  private static String path="/testpath";
   private static String domain="file://www.readytalk.com";
   private static String file=path + "?" + query;
   private static URL url;
@@ -15,7 +15,6 @@ private static void expect(boolean v) {
   private static void setupURL() throws MalformedURLException {
     StringBuilder builder = new StringBuilder();
     builder.append(domain);
-    builder.append("/");
     builder.append(file);
     url = new URL(builder.toString());
   }