Fixed thread leaks during shutdown.

Various codes have been modified to properly stop threads during
shutdown. A new ID attribute has been added to the LDAP connection
factory classes to help identify leaking threads.

https://fedorahosted.org/pki/ticket/1327

3 files changed, 11 insertions, 9 deletions

diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index e301e20ef..3ba6d7577 100644
--- a/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -626,10 +626,10 @@ public final class CMS {
         return _engine.getUserMessage(null /* from session context */, msgID, p1, p2, p3);
     }
 
-    public static LDAPConnection getBoundConnection(String host, int port,
+    public static LDAPConnection getBoundConnection(String id, String host, int port,
                int version, LDAPSSLSocketFactoryExt fac, String bindDN,
                String bindPW) throws LDAPException {
-        return _engine.getBoundConnection(host, port, version, fac,
+        return _engine.getBoundConnection(id, host, port, version, fac,
                          bindDN, bindPW);
     }
 
@@ -1330,9 +1330,9 @@ public final class CMS {
      *
      * @return bound LDAP connection pool
      */
-    public static ILdapConnFactory getLdapBoundConnFactory()
+    public static ILdapConnFactory getLdapBoundConnFactory(String id)
             throws ELdapException {
-        return _engine.getLdapBoundConnFactory();
+        return _engine.getLdapBoundConnFactory(id);
     }
 
     /**
@@ -1340,9 +1340,9 @@ public final class CMS {
      *
      * @return anonymous LDAP connection pool
      */
-    public static ILdapConnFactory getLdapAnonConnFactory()
+    public static ILdapConnFactory getLdapAnonConnFactory(String id)
             throws ELdapException {
-        return _engine.getLdapAnonConnFactory();
+        return _engine.getLdapAnonConnFactory(id);
     }
 
     /**
diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index b90c73997..57c2b6cb0 100644
--- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
@@ -640,9 +640,9 @@ public interface ICMSEngine extends ISubsystem {
      *
      * @return bound LDAP connection pool
      */
-    public ILdapConnFactory getLdapBoundConnFactory() throws ELdapException;
+    public ILdapConnFactory getLdapBoundConnFactory(String id) throws ELdapException;
 
-    public LDAPConnection getBoundConnection(String host, int port,
+    public LDAPConnection getBoundConnection(String id, String host, int port,
                int version, LDAPSSLSocketFactoryExt fac, String bindDN,
                String bindPW) throws LDAPException;
 
@@ -651,7 +651,7 @@ public interface ICMSEngine extends ISubsystem {
      *
      * @return anonymous LDAP connection pool
      */
-    public ILdapConnFactory getLdapAnonConnFactory() throws ELdapException;
+    public ILdapConnFactory getLdapAnonConnFactory(String id) throws ELdapException;
 
     /**
      * Retrieves the password check.
diff --git a/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
index 24c55d086..9bf3aa24b 100644
--- a/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
+++ b/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
@@ -45,4 +45,6 @@ public interface ISecurityDomainSessionTable {
     public long getTimeToLive();
 
     public Enumeration<String> getSessionIds();
+
+    public void shutdown();
 }