Hi,

My previous Socket patch broke ServerSocket. This fixes it again. Sorry for the 
inconvenience.

Regards,
Jeroen

2007-03-23  Jeroen Frijters  <[EMAIL PROTECTED]>

        * java/net/ServerSocket.java (implAccept): set implCreated flag on
        socket.
        * java/net/Socket.java (implCreated): Make package accessible for
        ServerSocket.
Index: ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.50
diff -u -r1.50 ServerSocket.java
--- ServerSocket.java   13 Dec 2006 20:29:50 -0000      1.50
+++ ServerSocket.java   23 Mar 2007 12:36:02 -0000
@@ -386,6 +386,7 @@
 
     impl.accept(socket.impl);
     socket.bound = true;
+    socket.implCreated = true;
 
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
Index: Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.62
diff -u -r1.62 Socket.java
--- Socket.java 19 Mar 2007 08:51:16 -0000      1.62
+++ Socket.java 23 Mar 2007 12:36:19 -0000
@@ -85,7 +85,8 @@
   /**
    * True if impl.create() has been called.
    */
-  private boolean implCreated;
+  // package-private because ServerSocket.implAccept() needs to access it.
+  boolean implCreated;
 
   /**
    * True if the socket is bound.

Reply via email to