[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4457 
Date: 2004/02/24 17:53:25
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-02-24  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath

        2004-02-12  Michael Koch  <konqueror at gmx.de>

        * java/net/ServerSocket.java
        (setReuseAddress): Use Boolean.valueOf() instead of creating a new
        Boolean object.

        2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>

        * java/net/ServerSocket.java (implAccept): Don't throw an
        IllegalBlockingModeException if we have a non-blocking
        channel which initiated this accept operation.

Members: 
	ChangeLog:1.2037->1.2038 
	libraries/javalib/java/net/ServerSocket.java:1.22->1.23 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2037 kaffe/ChangeLog:1.2038
--- kaffe/ChangeLog:1.2037	Tue Feb 24 17:28:35 2004
+++ kaffe/ChangeLog	Tue Feb 24 17:53:25 2004
@@ -4,6 +4,22 @@
 
 	2004-02-12  Michael Koch  <konqueror at gmx.de>
 
+        * java/net/ServerSocket.java
+        (setReuseAddress): Use Boolean.valueOf() instead of creating a new
+        Boolean object.
+
+	2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>
+
+        * java/net/ServerSocket.java (implAccept): Don't throw an
+        IllegalBlockingModeException if we have a non-blocking
+        channel which initiated this accept operation.
+
+2004-02-24  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath
+
+	2004-02-12  Michael Koch  <konqueror at gmx.de>
+
         * java/net/DatagramSocket.java
         (setReuseAddress): Use Boolean.valueOf() instead of creating a new
         Boolean object.
Index: kaffe/libraries/javalib/java/net/ServerSocket.java
diff -u kaffe/libraries/javalib/java/net/ServerSocket.java:1.22 kaffe/libraries/javalib/java/net/ServerSocket.java:1.23
--- kaffe/libraries/javalib/java/net/ServerSocket.java:1.22	Fri Jan  9 17:38:16 2004
+++ kaffe/libraries/javalib/java/net/ServerSocket.java	Tue Feb 24 17:53:28 2004
@@ -1,5 +1,6 @@
 /* ServerSocket.java -- Class for implementing server side sockets
-   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -345,9 +346,14 @@
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
     
+    // 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
+    // operation, then we must honor it regardless of its blocking mode.
     if (getChannel() != null
-        && !getChannel().isBlocking())
-      throw new IllegalBlockingModeException();
+        && !getChannel().isBlocking ()
+        && !((PlainSocketImpl) getImpl()).isInChannelOperation())
+      throw new IllegalBlockingModeException ();
 	    
     impl.accept(socket.getImpl());
   }
@@ -465,7 +471,7 @@
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
     
-    impl.setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    impl.setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**