1 files changed, 13 insertions, 5 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
index 02c8ab41d..fa2c8147f 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -976,14 +976,14 @@ public class CMSEngine implements ICMSEngine {
         return new LdapAuthInfo();
     }
 
-    public ILdapConnFactory getLdapBoundConnFactory()
+    public ILdapConnFactory getLdapBoundConnFactory(String id)
             throws ELdapException {
-        return new LdapBoundConnFactory();
+        return new LdapBoundConnFactory(id);
     }
 
-    public ILdapConnFactory getLdapAnonConnFactory()
+    public ILdapConnFactory getLdapAnonConnFactory(String id)
             throws ELdapException {
-        return new LdapAnonConnFactory();
+        return new LdapAnonConnFactory(id);
     }
 
     public IRequestEncoder getHttpRequestEncoder() {
@@ -1079,7 +1079,7 @@ public class CMSEngine implements ICMSEngine {
         }
     }
 
-    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 {
         return new LdapBoundConnection(host, port, version, fac,
@@ -1796,6 +1796,14 @@ public class CMSEngine implements ICMSEngine {
         shutdownSubsystems(mFinalSubsystems);
         shutdownSubsystems(mDynSubsystems);
         shutdownSubsystems(mStaticSubsystems);
+
+        if (mSDTimer != null) {
+            mSDTimer.cancel();
+        }
+
+        if (mSecurityDomainSessionTable != null) {
+            mSecurityDomainSessionTable.shutdown();
+        }
     }
 
     /**