Commit f8b7363e by Michael Koch Committed by Michael Koch

2003-06-20 Michael Koch <konqueror@gmx.de>

	* java/net/URLStreamHandler.java
	(hostsEqual): Rewritten.

From-SVN: r68260
parent c52c9fec
2003-06-20 Michael Koch <konqueror@gmx.de>
* java/net/URLStreamHandler.java
(hostsEqual): Rewritten.
2003-06-20 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/MappedByteFileBuffer.java,
gnu/java/nio/natMappedByteFileBuffer.cc:
Removed
......
......@@ -380,12 +380,20 @@ public abstract class URLStreamHandler
* @exception UnknownHostException If an unknown host is found
*/
protected boolean hostsEqual (URL url1, URL url2)
throws UnknownHostException
{
InetAddress addr1 = InetAddress.getByName (url1.getHost ());
InetAddress addr2 = InetAddress.getByName (url2.getHost ());
InetAddress addr1 = getHostAddress (url1);
InetAddress addr2 = getHostAddress (url2);
return addr1.equals (addr2);
if (addr1 != null || addr2 != null)
return addr1.equals (addr2);
String host1 = url1.getHost();
String host2 = url2.getHost();
if (host1 != null && host2 != null)
return host1.equalsIgnoreCase (host2);
return host1 == null && host2 == null;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment