src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java

*** 490,500 ****
       * Called by Connection.cleanup(). LdapClient should
       * notify any unsolicited listeners and removing itself from any pool.
       * This is almost like forceClose(), except it doesn't call
       * Connection.cleanup() (because this is called from cleanup()).
       */
!     void processConnectionClosure() {
          // Notify listeners
          synchronized (unsolicited) {
              if (unsolicited.size() > 0) {
                  String msg;
                  if (conn != null) {
--- 490,500 ----
       * Called by Connection.cleanup(). LdapClient should
       * notify any unsolicited listeners and removing itself from any pool.
       * This is almost like forceClose(), except it doesn't call
       * Connection.cleanup() (because this is called from cleanup()).
       */
!     synchronized void processConnectionClosure() {
          // Notify listeners
          synchronized (unsolicited) {
              if (unsolicited.size() > 0) {
                  String msg;
                  if (conn != null) {
*** 1497,1513 ****
  
      void removeUnsolicited(LdapCtx ctx) {
          if (debug > 0) {
              System.err.println("LdapClient.removeUnsolicited" + ctx);
          }
-         synchronized (unsolicited) {
-             if (unsolicited.size() == 0) {
-                 return;
-             }
              unsolicited.removeElement(ctx);
          }
-     }
  
      // NOTE: Cannot be synchronized because this is called asynchronously
      // by the reader thread in Connection. Instead, sync on 'unsolicited' Vector.
      void processUnsolicited(BerDecoder ber) {
          if (debug > 0) {
--- 1497,1508 ----