From cc1b3d6b642d0baf424a9fca1ad7d94e1f342b02 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 14 May 2003 06:37:59 +0000 Subject: 2003-05-14 Michael Koch * gnu/java/nio/FileLockImpl.java (released): New member variable. (FileLockImpl): Initialize released. (releaseImpl): New native method. (release): Implemented. * gnu/java/nio/SelectorImpl.java: Reformatted. * gnu/java/nio/SelectionKeyImpl.java: Reformatted. * gnu/java/nio/ServerSocketChannelImpl.java: Reformatted. (accept): Throws IOException. * gnu/java/nio/SocketChannelImpl.java: Reformatted. (implConfigureBlocking): Throws IOException. (connect): Likewise. (read): Likewise. (write): Likewise. * gnu/java/nio/natFileLockImpl.cc: New file. * java/nio/channels/FileLock.java: Reformatted. * Makefile.am: (ordinary_java_source_files): Added gnu/java/nio/FileLockImpl.java. (nat_source_files): Added gnu/java/nio/natFileLockImpl.cc. * Makefile.in: Regenerated. From-SVN: r66799 --- libjava/gnu/java/nio/SelectorImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/gnu/java/nio/SelectorImpl.java') diff --git a/libjava/gnu/java/nio/SelectorImpl.java b/libjava/gnu/java/nio/SelectorImpl.java index 0b513f9..e3eed25 100644 --- a/libjava/gnu/java/nio/SelectorImpl.java +++ b/libjava/gnu/java/nio/SelectorImpl.java @@ -261,16 +261,16 @@ public class SelectorImpl extends AbstractSelector // return impl; // } // else - + if (ch instanceof SocketChannelImpl) - { + { SocketChannelImpl sc = (SocketChannelImpl) ch; SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, sc.fd); add (impl); impl.interestOps (ops); impl.attach (att); return impl; - } + } else if (ch instanceof DatagramChannelImpl) { DatagramChannelImpl dc = (DatagramChannelImpl) ch; @@ -290,9 +290,9 @@ public class SelectorImpl extends AbstractSelector return impl; } else - { + { System.err.println ("INTERNAL ERROR, no known channel type"); - } + } return null; } -- cgit v1.1