--- old/src/share/classes/java/nio/channels/SelectionKey.java	2012-11-23 16:00:29.188641539 +0800
+++ new/src/share/classes/java/nio/channels/SelectionKey.java	2012-11-23 16:00:29.048641535 +0800
@@ -250,6 +250,14 @@
      * connection sequence, or has an error pending, then it will add
      * <tt>OP_CONNECT</tt> to the key's ready set and add the key to its
      * selected-key&nbsp;set.  </p>
+     *
+     * <p>
+     * Note an application should not use Selector's select() method to check
+     * <tt>OP_CONNECT</tt> again, once a channel is already connected. Please
+     * see {@link  java.nio.channels.Selector#select() Selector.select()} for
+     * more detail.
+     * </p>
+     *
      */
     public static final int OP_CONNECT = 1 << 3;
 
--- old/src/share/classes/java/nio/channels/Selector.java	2012-11-23 16:00:29.908641552 +0800
+++ new/src/share/classes/java/nio/channels/Selector.java	2012-11-23 16:00:29.768641546 +0800
@@ -306,6 +306,15 @@
      * thread is interrupted, or the given timeout period expires, whichever
      * comes first.
      *
+     * <p>
+     * Note an application should not check <tt>OP_CONNECT</tt> again, once a
+     * channel is already connected. In this situation, Selector will always
+     * treat <tt> OP_CONNECT</tt> as ready. If do so with only one key in this
+     * selector, and only one <tt>OP_CONNECT</tt> operation in the key's
+     * interest set, this method will return immediately with no entries in the
+     * selected key set.
+     * </p>
+     *
      * <p> This method does not offer real-time guarantees: It schedules the
      * timeout as if by invoking the {@link Object#wait(long)} method. </p>
      *
@@ -338,6 +347,23 @@
      * this selector's {@link #wakeup wakeup} method is invoked, or the current
      * thread is interrupted, whichever comes first.  </p>
      *
+     * <p>
+     * Note an application should not check <tt>OP_CONNECT</tt> again, once a
+     * channel is already connected. In this situation, Selector will always
+     * treat <tt> OP_CONNECT</tt> as ready. If do so with only one key in this
+     * selector, and only one <tt>OP_CONNECT</tt> operation in the key's
+     * interest set, this method will return immediately with no entries in the
+     * selected key set.
+     * </p>
+     *
+     * <p>
+     * Note that for <tt>OP_CONNECT</tt>, once a channel is already connected,
+     * an application should not check <tt>OP_CONNECT</tt> again. In this
+     * situation, Selector will ignore <tt>OP_CONNECT</tt>. If there is only one
+     * key in this selector, and only one <tt>OP_CONNECT</tt> operation in the key's
+     * interest set, this method will return immediately.
+     * </p>
+     *
      * @return  The number of keys, possibly zero,
      *          whose ready-operation sets were updated
      *
@@ -366,6 +392,15 @@
      * <p> Invoking this method more than once between two successive selection
      * operations has the same effect as invoking it just once.  </p>
      *
+     * <p>
+     * Note an application should not check <tt>OP_CONNECT</tt> again, once a
+     * channel is already connected. In this situation, Selector will always
+     * treat <tt> OP_CONNECT</tt> as ready. If do so with only one key in this
+     * selector, and only one <tt>OP_CONNECT</tt> operation in the key's
+     * interest set, this method will return immediately with no entries in the
+     * selected key set.
+     * </p>
+     *
      * @return  This selector
      */
     public abstract Selector wakeup();
--- old/src/share/classes/java/nio/channels/SocketChannel.java	2012-11-23 16:00:30.520641568 +0800
+++ new/src/share/classes/java/nio/channels/SocketChannel.java	2012-11-23 16:00:30.384641566 +0800
@@ -337,6 +337,12 @@
      * that is, if an invocation of this method throws a checked exception,
      * then the channel will be closed.  </p>
      *
+     * <p> Once a connection is established,
+     * {@link java.nio.channels.Selector#select() Selector.select()} method
+     * should never select <tt>OP_CONNECT</tt> again. Please see
+     * {@link java.nio.channels.Selector#select() Selector.select()} for detail.
+     * </p>
+     *
      * @param  remote
      *         The remote address to which this channel is to be connected
      *