--- old/src/share/classes/com/sun/jndi/ldap/Connection.java	Fri May 16 15:05:23 2014
+++ new/src/share/classes/com/sun/jndi/ldap/Connection.java	Fri May 16 15:05:23 2014
@@ -459,10 +459,10 @@
                             // will be woken up before readTimeout only if reply is
                             // available
                             ldr.wait(readTimeout);
-                            waited = true;
                         } else {
                             ldr.wait(15 * 1000); // 15 second timeout
                         }
+                        waited = true;
                     } else {
                         break;
                     }