This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Fix for PR/13102 / java.net.Socket
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 18 Nov 2003 22:22:48 +0100
- Subject: Patch: Fix for PR/13102 / java.net.Socket
Hi list,
I wrote the attached patch to fix PR 13102 and some other occurrences of this
bug.
Please review and comment.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2340
diff -u -b -B -r1.2340 ChangeLog
--- ChangeLog 18 Nov 2003 01:36:55 -0000 1.2340
+++ ChangeLog 18 Nov 2003 21:18:44 -0000
@@ -1,3 +1,10 @@
+2003-11-18 Michael Koch <konqueror@gmx.de>
+
+ * java/net/Socket.java
+ (implCreated): New variable that indicates created impl.
+ (getImpl): New method.
+ (various): Use getImpl() instead of impl.
+
2003-11-17 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicDefaults.java: Rewrite to spec.
Index: java/net/Socket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/Socket.java,v
retrieving revision 1.28
diff -u -b -B -r1.28 Socket.java
--- java/net/Socket.java 18 Sep 2003 11:32:46 -0000 1.28
+++ java/net/Socket.java 18 Nov 2003 21:18:44 -0000
@@ -84,6 +84,8 @@
*/
SocketImpl impl;
+ private boolean implCreated = false;
+
private boolean inputShutdown = false;
private boolean outputShutdown = false;
@@ -296,6 +298,25 @@
// that default. JDK 1.2 doc infers not to do a bind.
}
+ private SocketImpl getImpl()
+ throws SocketException
+ {
+ try
+ {
+ if (!implCreated)
+ {
+ impl.create(true);
+ implCreated = true;
+ }
+ }
+ catch (IOException e)
+ {
+ throw new SocketException(e.getMessage());
+ }
+
+ return impl;
+ }
+
/**
* Binds the socket to the givent local address/port
*
@@ -323,13 +344,10 @@
InetSocketAddress tmp = (InetSocketAddress) bindpoint;
- // create socket
- impl.create (true);
-
// bind to address/port
try
{
- impl.bind (tmp.getAddress(), tmp.getPort());
+ getImpl().bind (tmp.getAddress(), tmp.getPort());
}
catch (IOException exception)
{
@@ -399,7 +417,7 @@
try
{
- impl.connect (endpoint, timeout);
+ getImpl().connect (endpoint, timeout);
}
catch (IOException exception)
{
@@ -426,7 +444,19 @@
*/
public InetAddress getInetAddress ()
{
- return impl.getInetAddress();
+ if (!isConnected())
+ return null;
+
+ try
+ {
+ return getImpl().getInetAddress();
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are connected.
+ }
+
+ return null;
}
/**
@@ -440,9 +470,10 @@
public InetAddress getLocalAddress ()
{
InetAddress addr = null;
+
try
{
- addr = (InetAddress)impl.getOption(SocketOptions.SO_BINDADDR);
+ addr = (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR);
}
catch(SocketException e)
{
@@ -472,8 +503,18 @@
*/
public int getPort ()
{
- if (impl != null)
- return impl.getPort();
+ if (!isConnected())
+ return 0;
+
+ try
+ {
+ if (getImpl() != null)
+ return getImpl().getPort();
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are connected.
+ }
return -1;
}
@@ -486,8 +527,18 @@
*/
public int getLocalPort ()
{
- if (impl != null)
- return impl.getLocalPort();
+ if (!isBound())
+ return -1;
+
+ try
+ {
+ if (getImpl() != null)
+ return getImpl().getLocalPort();
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are bound.
+ }
return -1;
}
@@ -500,12 +551,20 @@
*/
public SocketAddress getLocalSocketAddress()
{
+ if (!isBound())
+ return null;
+
InetAddress addr = getLocalAddress ();
- if (addr == null)
+ try
+ {
+ return new InetSocketAddress (addr, getImpl().getLocalPort());
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are bound.
return null;
-
- return new InetSocketAddress (addr, impl.getLocalPort());
+ }
}
/**
@@ -519,7 +578,15 @@
if (!isConnected ())
return null;
- return new InetSocketAddress (impl.getInetAddress (), impl.getPort ());
+ try
+ {
+ return new InetSocketAddress (getImpl().getInetAddress (), getImpl().getPort ());
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are connected.
+ return null;
+ }
}
/**
@@ -531,8 +598,8 @@
*/
public InputStream getInputStream () throws IOException
{
- if (impl != null)
- return(impl.getInputStream());
+ if (getImpl() != null)
+ return getImpl().getInputStream();
throw new IOException("Not connected");
}
@@ -546,8 +613,8 @@
*/
public OutputStream getOutputStream () throws IOException
{
- if (impl != null)
- return impl.getOutputStream();
+ if (getImpl() != null)
+ return getImpl().getOutputStream();
throw new IOException("Not connected");
}
@@ -563,7 +630,7 @@
*/
public void setTcpNoDelay (boolean on) throws SocketException
{
- impl.setOption(SocketOptions.TCP_NODELAY, new Boolean(on));
+ getImpl().setOption(SocketOptions.TCP_NODELAY, new Boolean(on));
}
/**
@@ -580,7 +647,7 @@
*/
public boolean getTcpNoDelay() throws SocketException
{
- Object on = impl.getOption(SocketOptions.TCP_NODELAY);
+ Object on = getImpl().getOption(SocketOptions.TCP_NODELAY);
if (on instanceof Boolean)
return(((Boolean)on).booleanValue());
@@ -615,11 +682,11 @@
if (linger > 65535)
linger = 65535;
- impl.setOption(SocketOptions.SO_LINGER, new Integer(linger));
+ getImpl().setOption(SocketOptions.SO_LINGER, new Integer(linger));
}
else
{
- impl.setOption(SocketOptions.SO_LINGER, new Boolean(false));
+ getImpl().setOption(SocketOptions.SO_LINGER, new Boolean(false));
}
}
@@ -641,7 +708,8 @@
*/
public int getSoLinger() throws SocketException
{
- Object linger = impl.getOption(SocketOptions.SO_LINGER);
+ Object linger = getImpl().getOption(SocketOptions.SO_LINGER);
+
if (linger instanceof Integer)
return(((Integer)linger).intValue());
else
@@ -660,7 +728,7 @@
*/
public void sendUrgentData (int data) throws IOException
{
- impl.sendUrgentData (data);
+ getImpl().sendUrgentData (data);
}
/**
@@ -674,7 +742,7 @@
*/
public void setOOBInline (boolean on) throws SocketException
{
- impl.setOption(SocketOptions.SO_OOBINLINE, new Boolean(on));
+ getImpl().setOption(SocketOptions.SO_OOBINLINE, new Boolean(on));
}
/**
@@ -686,7 +754,7 @@
*/
public boolean getOOBInline () throws SocketException
{
- Object buf = impl.getOption(SocketOptions.SO_OOBINLINE);
+ Object buf = getImpl().getOption(SocketOptions.SO_OOBINLINE);
if (buf instanceof Boolean)
return(((Boolean)buf).booleanValue());
@@ -716,7 +784,7 @@
if (timeout < 0)
throw new IllegalArgumentException("SO_TIMEOUT value must be >= 0");
- impl.setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
+ getImpl().setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
}
/**
@@ -738,7 +806,7 @@
*/
public synchronized int getSoTimeout () throws SocketException
{
- Object timeout = impl.getOption(SocketOptions.SO_TIMEOUT);
+ Object timeout = getImpl().getOption(SocketOptions.SO_TIMEOUT);
if (timeout instanceof Integer)
return(((Integer)timeout).intValue());
else
@@ -762,7 +830,7 @@
if (size <= 0)
throw new IllegalArgumentException("SO_SNDBUF value must be > 0");
- impl.setOption(SocketOptions.SO_SNDBUF, new Integer(size));
+ getImpl().setOption(SocketOptions.SO_SNDBUF, new Integer(size));
}
/**
@@ -778,7 +846,7 @@
*/
public int getSendBufferSize () throws SocketException
{
- Object buf = impl.getOption(SocketOptions.SO_SNDBUF);
+ Object buf = getImpl().getOption(SocketOptions.SO_SNDBUF);
if (buf instanceof Integer)
return(((Integer)buf).intValue());
@@ -803,7 +871,7 @@
if (size <= 0)
throw new IllegalArgumentException("SO_RCVBUF value must be > 0");
- impl.setOption(SocketOptions.SO_RCVBUF, new Integer(size));
+ getImpl().setOption(SocketOptions.SO_RCVBUF, new Integer(size));
}
/**
@@ -819,7 +887,7 @@
*/
public int getReceiveBufferSize () throws SocketException
{
- Object buf = impl.getOption(SocketOptions.SO_RCVBUF);
+ Object buf = getImpl().getOption(SocketOptions.SO_RCVBUF);
if (buf instanceof Integer)
return(((Integer)buf).intValue());
@@ -839,7 +907,7 @@
*/
public void setKeepAlive (boolean on) throws SocketException
{
- impl.setOption(SocketOptions.SO_KEEPALIVE, new Boolean(on));
+ getImpl().setOption(SocketOptions.SO_KEEPALIVE, new Boolean(on));
}
/**
@@ -854,7 +922,7 @@
*/
public boolean getKeepAlive () throws SocketException
{
- Object buf = impl.getOption(SocketOptions.SO_KEEPALIVE);
+ Object buf = getImpl().getOption(SocketOptions.SO_KEEPALIVE);
if (buf instanceof Boolean)
return(((Boolean)buf).booleanValue());
@@ -869,8 +937,8 @@
*/
public synchronized void close () throws IOException
{
- if (impl != null)
- impl.close();
+ if (getImpl() != null)
+ getImpl().close();
if (getChannel() != null)
getChannel().close();
@@ -885,7 +953,19 @@
*/
public String toString ()
{
- return("Socket " + impl);
+ try
+ {
+ if (isConnected())
+ return ("Socket[addr=" + getImpl().getInetAddress()
+ + ",port=" + getImpl().getPort()
+ + ",localport=" + getImpl().getLocalPort());
+ }
+ catch (SocketException e)
+ {
+ // This cannot happen as we are connected.
+ }
+
+ return "Socket[unconnected]";
}
// Class Methods
@@ -930,8 +1010,8 @@
*/
public void shutdownInput() throws IOException
{
- if (impl != null)
- impl.shutdownInput();
+ if (getImpl() != null)
+ getImpl().shutdownInput();
inputShutdown = true;
}
@@ -945,8 +1025,8 @@
*/
public void shutdownOutput() throws IOException
{
- if (impl != null)
- impl.shutdownOutput();
+ if (getImpl() != null)
+ getImpl().shutdownOutput();
outputShutdown = true;
}
@@ -972,7 +1052,7 @@
*/
public boolean getReuseAddress () throws SocketException
{
- Object reuseaddr = impl.getOption (SocketOptions.SO_REUSEADDR);
+ Object reuseaddr = getImpl().getOption (SocketOptions.SO_REUSEADDR);
if (!(reuseaddr instanceof Boolean))
throw new SocketException ("Internal Error");
@@ -989,7 +1069,7 @@
*/
public void setReuseAddress (boolean on) throws SocketException
{
- impl.setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+ getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
}
/**
@@ -1003,7 +1083,7 @@
*/
public int getTrafficClass () throws SocketException
{
- Object obj = impl.getOption(SocketOptions.IP_TOS);
+ Object obj = getImpl().getOption(SocketOptions.IP_TOS);
if (obj instanceof Integer)
return ((Integer) obj).intValue ();
@@ -1028,7 +1108,7 @@
if (tc < 0 || tc > 255)
throw new IllegalArgumentException();
- impl.setOption (SocketOptions.IP_TOS, new Integer (tc));
+ getImpl().setOption (SocketOptions.IP_TOS, new Integer (tc));
}
/**
@@ -1038,7 +1118,14 @@
*/
public boolean isConnected ()
{
- return impl.getInetAddress () != null;
+ try
+ {
+ return getImpl().getInetAddress () != null;
+ }
+ catch (SocketException e)
+ {
+ return false;
+ }
}
/**