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

Imported GNU Classpath 0.19 + gcj-import-20051115.

Browse source 
* sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049
This commit is contained in:
Mark Wielaard 2005-11-15 23:20:01 +00:00
parent 02e549bfaa
commit 8f523f3a10
1241 changed files with 97711 additions and 25284 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libjava/classpath/java/net/URLStreamHandler.java
View file

@ -411,8 +411,6 @@ public abstract class URLStreamHandler
* @param url2 The second URL.
*
* @return True if both URLs contain the same host.
*
* @exception UnknownHostException If an unknown host is found
*/
protected boolean hostsEqual(URL url1, URL url2)
{
@ -511,18 +509,24 @@ public abstract class URLStreamHandler
int size = protocol.length() + authority.length() + file.length() + 24;
StringBuffer sb = new StringBuffer(size);
if (protocol != null && protocol.length() > 0)
if (protocol.length() > 0)
{
sb.append(protocol);
sb.append(":");
}
if (authority.length() != 0)
{
sb.append("//").append(authority);
}
sb.append(file);
// If we have superfluous leading slashes (that means, at least 2)
// we always add the authority component ("//" + host) to
// avoid ambiguity. Otherwise we would generate an URL like
// proto://home/foo
// where we meant:
// host: <empty> - file: //home/foo
// but URL spec says it is:
// host: home - file: /foo
if (authority.length() != 0 || file.startsWith("//") )
sb.append("//").append(authority).append(file);
else
sb.append(file);
if (ref != null)
sb.append('#').append(ref);