From 137f5e8417ffa8ce2160bce1d45ce3b54ed16add Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Thu, 9 Oct 2003 18:01:08 +0000
Subject: SelectorImpl.java (register): Use ServerSocketChannelSelectionKey for
 server socket channels...

2003-10-09  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/SelectorImpl.java (register):
	Use ServerSocketChannelSelectionKey for server socket channels,
	removed unneeded comments.
	* gnu/java/nio/ServerSocketChannelImpl.java
	(ServerSocketChannelImpl): Made class public final.
	(impl): New member variable.
	(ServerSocketChannelImpl): Initialize member variables correctly.
	(initServerSocket): New method.
	(getNativeFD): Likewise.
	* gnu/java/nio/ServerSocketChannelSelectionKey.java,
	gnu/java/nio/natServerSocketChannelImpl.cc: New files.
	* Makefile.am (ordinary_java_source_files):
	Added gnu/java/nio/ServerSocketChannelSelectionKey.java.
	(nat_source_files): Added gnu/java/nio/natServerSocketChannelImpl.cc.
	* Makefile.in: Regenrated.

From-SVN: r72277
---
 libjava/gnu/java/nio/ServerSocketChannelImpl.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'libjava/gnu/java/nio/ServerSocketChannelImpl.java')

diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/gnu/java/nio/ServerSocketChannelImpl.java
index 05ad0ae..3ee0ae0 100644
--- a/libjava/gnu/java/nio/ServerSocketChannelImpl.java
+++ b/libjava/gnu/java/nio/ServerSocketChannelImpl.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package gnu.java.nio;
 
+import gnu.java.net.PlainSocketImpl;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -47,9 +48,10 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
 
-class ServerSocketChannelImpl extends ServerSocketChannel
+public final class ServerSocketChannelImpl extends ServerSocketChannel
 {
   ServerSocket serverSocket;
+  PlainSocketImpl impl;
   boolean blocking = true;
   boolean connected = false;
 
@@ -57,7 +59,20 @@ class ServerSocketChannelImpl extends ServerSocketChannel
     throws IOException
   {
     super (provider);
-    serverSocket = new ServerSocket ();
+    impl = new PlainSocketImpl();
+    initServerSocket();
+  }
+
+  /*
+   * This method is only need to call a package private constructor
+   * of java.net.ServerSocket. It only initializes the member variables
+   * "serverSocket".
+   */
+  private native void initServerSocket() throws IOException;
+
+  public int getNativeFD()
+  {
+    return impl.getNativeFD();
   }
  
   public void finalizer()
-- 
cgit v1.1