[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4453 
Date: 2004/02/23 22:34:04
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-02-23  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath

        2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>

        * gnu/java/nio/ServerSocketChannelImpl.java
        (accept): Set and reset our server socket's PlainSocketImpl's
        "in channel operation" indicator before and after delegating
        the accept to our server socket.

Members: 
	ChangeLog:1.2033->1.2034 
	libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2033 kaffe/ChangeLog:1.2034
--- kaffe/ChangeLog:1.2033	Mon Feb 23 22:20:26 2004
+++ kaffe/ChangeLog	Mon Feb 23 22:34:04 2004
@@ -4,6 +4,17 @@
 
 	2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>
 
+        * gnu/java/nio/ServerSocketChannelImpl.java
+        (accept): Set and reset our server socket's PlainSocketImpl's
+        "in channel operation" indicator before and after delegating
+        the accept to our server socket.
+
+2004-02-23  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath
+
+	2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>
+
         * gnu/java/net/PlainSocketImpl.java
         (inChannelOperation): New field.
         (isInChannelOperation): New accessor.
Index: kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.5 kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.6
--- kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.5	Thu Jan  8 17:17:33 2004
+++ kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java	Mon Feb 23 22:34:06 2004
@@ -1,5 +1,5 @@
 /* ServerSocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -69,7 +69,7 @@
   {
     return serverSocket.getPlainSocketImpl().getNativeFD();
   }
- 
+  
   public void finalizer()
   {
     if (connected)
@@ -107,6 +107,11 @@
     
     try
       {
+        begin();
+        serverSocket.getPlainSocketImpl().setInChannelOperation(true);
+          // indicate that a channel is initiating the accept operation
+          // so that the socket ignores the fact that we might be in
+          // non-blocking mode.
         NIOSocket socket = (NIOSocket) serverSocket.accept();
         completed = true;
         return socket.getChannel();
@@ -117,6 +122,7 @@
       }
     finally
       {
+        serverSocket.getPlainSocketImpl().setInChannelOperation(false);
         end (completed);
       }
   }