ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-12 20:28:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote branch 'oss/master' into jdk7

Browse Source
This commit is contained in:
Joel Dice
2012-02-27 18:19:22 -07:00
parent 747f22115f c6ac66e45a
commit a61c1aba60
9 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classpath/java/net/URL.java
View File

@ -81,7 +81,9 @@ public final class URL {
private static URLStreamHandler findHandler(String protocol)
throws MalformedURLException
{
if ("resource".equals(protocol)) {
if ("http".equals(protocol) || "https".equals(protocol)) {
return new avian.http.Handler();
} else if ("resource".equals(protocol)) {
return new avian.resource.Handler();
} else if ("file".equals(protocol)) {
return new avian.file.Handler();

2
classpath/java/net/URLStreamHandler.java
View File

@ -38,7 +38,7 @@ public abstract class URLStreamHandler {
host = s.substring(0, slash);
} else {
host = s.substring(0, colon);
port = Integer.parseInt(s.substring(colon + 1), slash);
port = Integer.parseInt(s.substring(colon + 1, slash));
}
s = s.substring(slash);
}