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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -436,18 +436,18 @@
         if (referenceCount <= 0 && conn != null) {
             if (debug > 0) System.err.println("LdapClient: closed connection " + this);
             if (!pooled) {
                 // Not being pooled; continue with closing
                 conn.cleanup(reqCtls, false);
-                conn = null;
+                //conn = null;
             } else {
                 // Pooled
 
                 // Is this a real close or a request to return conn to pool
                 if (hardClose) {
                     conn.cleanup(reqCtls, false);
-                    conn = null;
+                    //conn = null;
                     pcb.removePooledConnection(this);
                 } else {
                     pcb.releasePooledConnection(this);
                 }
             }

@@ -464,11 +464,11 @@
 
         if (conn != null) {
             if (debug > 0) System.err.println(
                 "LdapClient: forced close of connection " + this);
             conn.cleanup(null, false);
-            conn = null;
+            //conn = null;
 
             if (cleanPool) {
                 pcb.removePooledConnection(this);
             }
         }