From 82d1ae8e413786e0bd1709cc9a2fe284dc983aab Mon Sep 17 00:00:00 2001 From: mkoch Date: Tue, 2 Dec 2003 15:03:21 +0000 Subject: 2003-12-02 Michael Koch * gnu/java/nio/DatagramChannelImpl.java (blocking): Initialize with true by default. * gnu/java/nio/ServerSocketChannelImpl.java (serverSocket): Made private. (blocking): Likewise. (connected): Likewise. * gnu/java/nio/SocketChannelImpl.java (connectionPending): Made private. * gnu/java/nio/FileLockImpl.java (static): Load native library (needed for classpath). * gnu/java/nio/SelectorImpl.java (static): Load native library (needed for classpath). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74181 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/nio/DatagramChannelImpl.java | 2 +- libjava/gnu/java/nio/FileLockImpl.java | 10 ++++++++++ libjava/gnu/java/nio/SelectorImpl.java | 10 ++++++++++ libjava/gnu/java/nio/ServerSocketChannelImpl.java | 6 +++--- libjava/gnu/java/nio/SocketChannelImpl.java | 2 +- 5 files changed, 25 insertions(+), 5 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java index a77355d0ff8..af43256cc28 100644 --- a/libjava/gnu/java/nio/DatagramChannelImpl.java +++ b/libjava/gnu/java/nio/DatagramChannelImpl.java @@ -56,7 +56,7 @@ import java.nio.channels.spi.SelectorProvider; public final class DatagramChannelImpl extends DatagramChannel { private NIODatagramSocket socket; - private boolean blocking = false; + private boolean blocking = true; protected DatagramChannelImpl (SelectorProvider provider) throws IOException diff --git a/libjava/gnu/java/nio/FileLockImpl.java b/libjava/gnu/java/nio/FileLockImpl.java index 189e03ac81e..f85d60ad67f 100644 --- a/libjava/gnu/java/nio/FileLockImpl.java +++ b/libjava/gnu/java/nio/FileLockImpl.java @@ -42,6 +42,7 @@ import java.io.FileDescriptor; import java.io.IOException; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; +import gnu.classpath.Configuration; /** * @author Michael Koch @@ -49,6 +50,15 @@ import java.nio.channels.FileLock; */ public class FileLockImpl extends FileLock { + static + { + // load the shared library needed for native methods. + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary ("javanio"); + } + } + private FileDescriptor fd; private boolean released; diff --git a/libjava/gnu/java/nio/SelectorImpl.java b/libjava/gnu/java/nio/SelectorImpl.java index 60a81f98458..05a537afb5e 100644 --- a/libjava/gnu/java/nio/SelectorImpl.java +++ b/libjava/gnu/java/nio/SelectorImpl.java @@ -49,9 +49,19 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import gnu.classpath.Configuration; public class SelectorImpl extends AbstractSelector { + static + { + // load the shared library needed for native methods. + if (Configuration.INIT_LOAD_LIBRARY) + { + System.loadLibrary ("javanio"); + } + } + private Set keys; private Set selected; diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/gnu/java/nio/ServerSocketChannelImpl.java index 89bbdec8746..97943c0ff8e 100644 --- a/libjava/gnu/java/nio/ServerSocketChannelImpl.java +++ b/libjava/gnu/java/nio/ServerSocketChannelImpl.java @@ -54,9 +54,9 @@ import java.nio.channels.spi.SelectorProvider; public final class ServerSocketChannelImpl extends ServerSocketChannel { - NIOServerSocket serverSocket; - boolean blocking = true; - boolean connected = false; + private NIOServerSocket serverSocket; + private boolean blocking = true; + private boolean connected; protected ServerSocketChannelImpl (SelectorProvider provider) throws IOException diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index ae7af3c5908..46c0d8c0fae 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -66,7 +66,7 @@ public final class SocketChannelImpl extends SocketChannel private PlainSocketImpl impl; private NIOSocket socket; private boolean blocking = true; - private boolean connectionPending = false; + private boolean connectionPending; SocketChannelImpl (SelectorProvider provider) throws IOException -- cgit v1.2.3