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

[Kaffe CVS]

PatchSet 4452 
Date: 2004/02/23 22:20:26
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/net/PlainSocketImpl.java
        (inChannelOperation): New field.
        (isInChannelOperation): New accessor.
        (setInChannelOperation): New modifier.

Members: 
	ChangeLog:1.2032->1.2033 
	libraries/javalib/gnu/java/net/PlainSocketImpl.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2032 kaffe/ChangeLog:1.2033
--- kaffe/ChangeLog:1.2032	Mon Feb 23 22:07:49 2004
+++ kaffe/ChangeLog	Mon Feb 23 22:20:26 2004
@@ -2,6 +2,17 @@
 
 	Resynced with GNU Classpath
 
+	2004-02-06  Mohan Embar  <gnustuff at thisiscool.com>
+
+        * gnu/java/net/PlainSocketImpl.java
+        (inChannelOperation): New field.
+        (isInChannelOperation): New accessor.
+        (setInChannelOperation): New modifier.
+
+2004-02-23  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath
+
 	2004-02-06  Michael Koch  <konqueror at gmx.de>
 
         * gnu/java/nio/NIOServerSocket.java
Index: kaffe/libraries/javalib/gnu/java/net/PlainSocketImpl.java
diff -u kaffe/libraries/javalib/gnu/java/net/PlainSocketImpl.java:1.2 kaffe/libraries/javalib/gnu/java/net/PlainSocketImpl.java:1.3
--- kaffe/libraries/javalib/gnu/java/net/PlainSocketImpl.java:1.2	Thu Jan  8 16:38:48 2004
+++ kaffe/libraries/javalib/gnu/java/net/PlainSocketImpl.java	Mon Feb 23 22:20:28 2004
@@ -29,7 +29,33 @@
 private boolean blocking;
 private boolean connecting;
 private int native_fd;
+  /**
+   * Indicates whether a channel initiated whatever operation
+   * is being invoked on this socket.
+   */
+  private boolean inChannelOperation;
 
+  /**
+   * Indicates whether we should ignore whether any associated
+   * channel is set to non-blocking mode. Certain operations
+   * throw an <code>IllegalBlockingModeException</code> if the
+   * associated channel is in non-blocking mode, <i>except</i>
+   * if the operation is invoked by the channel itself.
+   */
+  public final boolean isInChannelOperation()
+  {
+    return inChannelOperation;
+  }
+  
+  /**
+   * Sets our indicator of whether an I/O operation is being
+   * initiated by a channel.
+   */
+  public final void setInChannelOperation(boolean b)
+  {
+    inChannelOperation = b;
+  }
+ 
 static {
 	System.loadLibrary("net");
 }