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

URLStreamHandler.java (sameFile): Fix port value comparison.

Browse source 
2003-06-08  Anthony Green  <green@redhat.com>

        * java/net/URLStreamHandler.java (sameFile): Fix port value
        comparison.
        * java/net/URL.java (handler): Make package private.
        * gnu/gcj/protocol/http/Handler.java (getDefaultPort): New method.

From-SVN: r67640
This commit is contained in:
Anthony Green 2003-06-08 22:07:48 +00:00 • committed by Anthony Green
parent 51d2dfa601
commit a8a8de4875
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/java/net/URLStreamHandler.java
View file

@ -265,7 +265,15 @@ public abstract class URLStreamHandler
return true;
// This comparison is very conservative. It assumes that any
// field can be null.
if (url1 == null || url2 == null || url1.getPort() != url2.getPort())
if (url1 == null || url2 == null)
return false;
int p1 = url1.getPort ();
if (p1 == -1)
p1 = url1.handler.getDefaultPort ();
int p2 = url2.getPort ();
if (p2 == -1)
p2 = url2.handler.getDefaultPort ();
if (p1 != p2)
return false;
String s1, s2;
s1 = url1.getProtocol();