[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Thu Jan 8 08:54:09 2004
PatchSet 4293
Date: 2004/01/08 16:50:10
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath
2004-01-08 Dalibor Topic <robilad@kaffe.org>
Resynced with GNU Classpath.
2004-01-08 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/DatagramChannelImpl.java
(blocking): Removed.
(DatagramChannelImpl): Call configureBlocking().
(implConfigureBlocking): Don't initialize blocking.
Members:
ChangeLog:1.1880->1.1881
libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1880 kaffe/ChangeLog:1.1881
--- kaffe/ChangeLog:1.1880 Thu Jan 8 16:38:46 2004
+++ kaffe/ChangeLog Thu Jan 8 16:50:10 2004
@@ -2,6 +2,17 @@
Resynced with GNU Classpath.
+ 2004-01-08 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/nio/DatagramChannelImpl.java
+ (blocking): Removed.
+ (DatagramChannelImpl): Call configureBlocking().
+ (implConfigureBlocking): Don't initialize blocking.
+
+2004-01-08 Dalibor Topic <robilad@kaffe.org>
+
+ Resynced with GNU Classpath.
+
2003-10-09 Michael Koch <konqueror@gmx.de>
* gnu/java/net/PlainSocketImpl.java: Added classes SocketInputStream
Index: kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.5 kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.6
--- kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.5 Wed Dec 3 20:09:33 2003
+++ kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java Thu Jan 8 16:50:12 2004
@@ -56,13 +56,13 @@
public final class DatagramChannelImpl extends DatagramChannel
{
private NIODatagramSocket socket;
- private boolean blocking = false;
protected DatagramChannelImpl (SelectorProvider provider)
throws IOException
{
super (provider);
socket = new NIODatagramSocket (new PlainDatagramSocketImpl(), this);
+ configureBlocking(true);
}
public int getNativeFD()
@@ -85,7 +85,6 @@
throws IOException
{
socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
- this.blocking = blocking;
}
public DatagramChannel connect (SocketAddress remote)