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

Merge GNU Classpath 0.99 into libjava.

Browse source 
From-SVN: r185741
This commit is contained in:
Andrew John Hughes 2012-03-23 15:19:26 +00:00
parent 21669dfe20
commit 0563022a20
516 changed files with 64503 additions and 61116 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libjava/classpath/java/net/Socket.java
View file

@ -428,7 +428,9 @@ public class Socket
* @exception IllegalBlockingModeException If this socket has an associated
* channel, and the channel is in non-blocking mode
* @exception SocketTimeoutException If the timeout is reached
*
* @throws SecurityException if the SocketAddress is an {@link InetSocketAddress}
* and a security manager is present which does not
* allow connections on the given host and port.
* @since 1.4
*/
public void connect(SocketAddress endpoint, int timeout)
@ -440,6 +442,13 @@ public class Socket
if (! (endpoint instanceof InetSocketAddress))
throw new IllegalArgumentException("unsupported address type");
SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
InetSocketAddress inetAddr = (InetSocketAddress) endpoint;
sm.checkConnect(inetAddr.getHostName(), inetAddr.getPort());
}
// The Sun spec says that if we have an associated channel and
// it is in non-blocking mode, we throw an IllegalBlockingModeException.
// However, in our implementation if the channel itself initiated this