2003-06-14 Michael Koch <konqueror@gmx.de>

	* gnu/java/nio/FileChannelImpl.java
        (map_address): Removed incorrect comment.
	* gnu/java/nio/SelectorImpl.java
        (register): Remove code duplication and code for file channel handling.
	* gnu/java/nio/ServerSocketChannelImpl.java
        (serverSocket): Renamed from sock_object.
        (ServerSocketChannel): Initialize serverSocket.
        (socket): Return serverSocket.
	* gnu/java/nio/SocketChannelImpl.java
        (socket): Renamed from sock_object.
        (isConnectionPenging): Simplified.
        (socket): Return socket.

From-SVN: r67940

1 files changed, 3 insertions, 3 deletions

diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/gnu/java/nio/ServerSocketChannelImpl.java
index 0b3fc66e981..aded2207880 100644
--- a/libjava/gnu/java/nio/ServerSocketChannelImpl.java
+++ b/libjava/gnu/java/nio/ServerSocketChannelImpl.java
@@ -47,7 +47,7 @@ import java.nio.channels.spi.SelectorProvider;
 
 class ServerSocketChannelImpl extends ServerSocketChannel
 {
-  ServerSocket sock_object;
+  ServerSocket serverSocket;
   int fd;
 //   int local_port;
   boolean blocking = true;
@@ -62,7 +62,7 @@ class ServerSocketChannelImpl extends ServerSocketChannel
 
     try
       {
-        sock_object = new ServerSocket ();
+        serverSocket = new ServerSocket ();
       }
     catch (IOException e)
       {
@@ -106,6 +106,6 @@ class ServerSocketChannelImpl extends ServerSocketChannel
 
   public ServerSocket socket ()
   {
-    return sock_object;
+    return serverSocket;
   }
 }