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

BindException.java, [...]: Big import statement and @author tag cleanup.

Browse source 
2004-10-17  Michael Koch  <konqueror@gmx.de>

	* java/net/BindException.java,
	java/net/ConnectException.java,
	java/net/ContentHandler.java,
	java/net/ContentHandlerFactory.java,
	java/net/DatagramPacket.java,
	java/net/DatagramSocket.java,
	java/net/DatagramSocketImpl.java,
	java/net/DatagramSocketImplFactory.java,
	java/net/FileNameMap.java,
	java/net/HttpURLConnection.java,
	java/net/MalformedURLException.java,
	java/net/MulticastSocket.java,
	java/net/NetworkInterface.java,
	java/net/NoRouteToHostException.java,
	java/net/PasswordAuthentication.java,
	java/net/PortUnreachableException.java,
	java/net/ProtocolException.java,
	java/net/ServerSocket.java,
	java/net/Socket.java,
	java/net/SocketException.java,
	java/net/SocketImpl.java,
	java/net/SocketImplFactory.java,
	java/net/SocketOptions.java,
	java/net/SocketPermission.java,
	java/net/SocketTimeoutException.java,
	java/net/URI.java,
	java/net/URISyntaxException.java,
	java/net/URL.java,
	java/net/URLDecoder.java,
	java/net/URLEncoder.java,
	java/net/URLStreamHandler.java,
	java/net/URLStreamHandlerFactory.java,
	java/net/UnknownHostException.java,
	java/net/UnknownServiceException.java:
	Big import statement and @author tag cleanup.

From-SVN: r89168
This commit is contained in:
Michael Koch 2004-10-17 08:29:57 +00:00 • committed by Michael Koch
parent 3238d4f99a
commit 05dfb0b0e3
35 changed files with 140 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libjava/java/net/SocketPermission.java
View file

@ -151,13 +151,13 @@ public final class SocketPermission extends Permission implements Serializable
public boolean equals(Object obj)
{
if (! (obj instanceof SocketPermission))
return (false);
return false;
if (((SocketPermission) obj).hostport.equals(hostport))
if (((SocketPermission) obj).actions.equals(actions))
return (true);
return true;
return (false);
return false;
}
/**
@ -216,7 +216,7 @@ public final class SocketPermission extends Permission implements Serializable
else if (actions.indexOf("resolve") != -1)
sb.append("resolve");
return (sb.toString());
return sb.toString();
}
/**
@ -229,7 +229,7 @@ public final class SocketPermission extends Permission implements Serializable
{
// FIXME: Implement
return (null);
return null;
}
/**
@ -265,14 +265,14 @@ public final class SocketPermission extends Permission implements Serializable
if (perm instanceof SocketPermission)
p = (SocketPermission) perm;
else
return (false);
return false;
// Next check the actions
String ourlist = getActions();
String theirlist = p.getActions();
if (! ourlist.startsWith(theirlist))
return (false);
return false;
// Now check ports
int ourfirstport = 0;
@ -347,7 +347,7 @@ public final class SocketPermission extends Permission implements Serializable
// Now check them
if ((theirfirstport < ourfirstport) || (theirlastport > ourlastport))
return (false);
return false;
// Finally we can check the hosts
String ourhost;
@ -369,7 +369,7 @@ public final class SocketPermission extends Permission implements Serializable
// Are they equal?
if (ourhost.equals(theirhost))
return (true);
return true;
// Try the canonical names
String ourcanonical = null;
@ -392,17 +392,17 @@ public final class SocketPermission extends Permission implements Serializable
}
if (ourcanonical.equals(theircanonical))
return (true);
return true;
// Well, last chance. Try for a wildcard
if (ourhost.indexOf("*.") != -1)
{
String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1));
if (theircanonical.endsWith(wild_domain))
return (true);
return true;
}
// Didn't make it
return (false);
return false;
}
}