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

[Kaffe CVS]

PatchSet 4456 
Date: 2004/02/24 17:28:35
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/DatagramSocket.java
        (setReuseAddress): Use Boolean.valueOf() instead of creating a new
        Boolean object.
        (setBroadcast): Likewise.

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

        * java/net/DatagramSocket.java (receive): Don't throw an
        IllegalBlockingModeException if we have a non-blocking
        channel which initiated this operation.
        (send): Likewise.

Members: 
	ChangeLog:1.2036->1.2037 
	libraries/javalib/java/net/DatagramSocket.java:1.20->1.21 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2036 kaffe/ChangeLog:1.2037
--- kaffe/ChangeLog:1.2036	Mon Feb 23 22:56:35 2004
+++ kaffe/ChangeLog	Tue Feb 24 17:28:35 2004
@@ -1,3 +1,21 @@
+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.
+        (setBroadcast): Likewise.
+
+	2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>
+
+        * java/net/DatagramSocket.java (receive): Don't throw an
+        IllegalBlockingModeException if we have a non-blocking
+        channel which initiated this operation.
+        (send): Likewise.
+
 2004-02-23  Dalibor Topic <robilad at kaffe.org>
 
 	Resynced with GNU Classpath
Index: kaffe/libraries/javalib/java/net/DatagramSocket.java
diff -u kaffe/libraries/javalib/java/net/DatagramSocket.java:1.20 kaffe/libraries/javalib/java/net/DatagramSocket.java:1.21
--- kaffe/libraries/javalib/java/net/DatagramSocket.java:1.20	Sat Dec 27 21:15:58 2003
+++ kaffe/libraries/javalib/java/net/DatagramSocket.java	Tue Feb 24 17:28:36 2004
@@ -39,6 +39,7 @@
 package java.net;
 
 import gnu.java.net.PlainDatagramSocketImpl;
+import gnu.java.nio.DatagramChannelImpl;
 import java.io.IOException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.IllegalBlockingModeException;
@@ -565,7 +566,8 @@
         ("Socket connected to a multicast address my not receive");
 
     if (getChannel() != null
-        && !getChannel().isBlocking ())
+        && !getChannel().isBlocking ()
+        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
       throw new IllegalBlockingModeException ();
 
     getImpl().receive(p);
@@ -618,7 +620,8 @@
     // use getTimeToLive for TTL val.
 
     if (getChannel() != null
-        && !getChannel().isBlocking ())
+        && !getChannel().isBlocking ()
+        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
       throw new IllegalBlockingModeException ();
 
     getImpl().send(p);
@@ -795,7 +798,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
@@ -834,7 +837,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption(SocketOptions.SO_BROADCAST, new Boolean(enable));
+    getImpl().setOption(SocketOptions.SO_BROADCAST, Boolean.valueOf(enable));
   }
 
   /**