procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath gcj-import-20051117.

Browse source 
* gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153
This commit is contained in:
Mark Wielaard 2005-11-18 00:59:33 +00:00
parent fb3a09c214
commit ca9e049bc1
102 changed files with 6716 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libjava/classpath/java/net/URL.java
View file

@ -408,10 +408,7 @@ public final class URL implements Serializable
// The 1.2 doc specifically says these are copied to the new URL.
host = context.host;
port = context.port;
file = context.file;
userInfo = context.userInfo;
if (file == null || file.length() == 0)
file = "/";
authority = context.authority;
}
}
@ -423,10 +420,13 @@ public final class URL implements Serializable
protocol = context.protocol;
host = context.host;
port = context.port;
file = context.file;
userInfo = context.userInfo;
if (file == null || file.length() == 0)
file = "/";
if (spec.indexOf(":/", 1) < 0)
{
file = context.file;
if (file == null || file.length() == 0)
file = "/";
}
authority = context.authority;
}
else // Protocol NOT specified in spec. and no context available.