FYI: Patch: java.nio

[Michael Koch]

Hi list,


I just commited the attached patch to merge the latest NIO and NIO 
related fixes from libgcj.


Michael


2004-02-06  Michael Koch  <address@hidden>

        * gnu/java/nio/NIOServerSocket.java
        (impl): Unused, removed.
        * gnu/java/nio/SocketChannelImpl.java
        (finnishConnect): Don't throw NoConnectionPendingException if not
        connected or no connection pending.

2004-02-06  Mohan Embar  <address@hidden>

        * gnu/java/nio/DatagramChannelImpl.java
        (inChannelOperation): New field.
        (isInChannelOperation): New accessor.
        (setInChannelOperation): New modifier.
        (receive): Use capacity() - position() of destination
        buffer instead of remaining(). Set and reset our "in
        channel operation indicator" before and after delegating
        the receive to our datagram socket. Removed testing code.
        Update destination buffer's current position if it is
        backed by a byte array (hasArray() is true).
        (send): Set and reset our "in channel operation indicator"
        before and after delegating the send to our datagram socket.
        Removed testing code. Update source buffer's current position
        if it is backed by a byte array (hasArray() is true).
        * gnu/java/nio/SocketChannelImpl.java (read(ByteBuffer)):
        Use capacity() - position() of destination buffer instead
        of remaining().
        * java/net/DatagramSocket.java (receive): Don't throw an
        IllegalBlockingModeException if we have a non-blocking
        channel which initiated this operation.
        (send): Likewise.

2004-02-06  Mohan Embar  <address@hidden>

        * gnu/java/net/PlainSocketImpl.java 
        (inChannelOperation): New field.
        (isInChannelOperation): New accessor.
        (setInChannelOperation): New modifier.
        * 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.
        * gnu/java/nio/SocketChannelImpl.java
        (connect): Set and reset our socket's PlainSocketImpl's "in channel
        operation" indicator before and after delegating the operation to
        our socket.
        (read): Likewise.
        (write): Likewise.
        * java/net/ServerSocket.java (implAccept): Don't throw an
        IllegalBlockingModeException if we have a non-blocking
        channel which initiated this accept operation.
        * java/net/Socket.java (connect): Don't throw an
        IllegalBlockingModeException if we have a non-blocking
        channel which initiated this connect operation.
        * java/nio/channels/spi/AbstractSelectableChannel.java
        (configureBlocking): Only call implConfigureBlocking() if
        the desired blocking mode is different from our current one.

nio.diff
Description: Text Data