--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Wed Aug 31 09:22:50 2011 +0800
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Thu Sep 01 06:45:00 2011 +0100
@@ -457,10 +457,10 @@
         }
 
         /*
-         * If connection has been reset then return 0 to indicate
-         * there are no buffered bytes.
+         * If connection has been reset or shut down for input, then return 0
+         * to indicate there are no buffered bytes.
          */
-        if (isConnectionReset()) {
+        if (isConnectionReset() || shut_rd) {
             return 0;
         }