diff options
Diffstat (limited to 'base/common')
13 files changed, 11 insertions, 31 deletions
diff --git a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java index f52904718..f2d09df9e 100644 --- a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java @@ -435,7 +435,6 @@ public abstract class DirBasedAuthentication try { if (mConnFactory != null) { mConnFactory.reset(); - mConnFactory = null; } } catch (ELdapException e) { // ignore diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java index bf4ca7f5a..133fe759e 100644 --- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -343,8 +343,7 @@ public class DirAclAuthz extends AAclAuthz } try { - mLdapConnFactory.reset(); - mLdapConnFactory = null; + if (mLdapConnFactory != null) mLdapConnFactory.reset(); } catch (ELdapException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_LDAP_ERROR", e.toString())); } diff --git a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index c5b09a7d7..549ce01f9 100644 --- a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -466,11 +466,8 @@ public class AuthSubsystem implements IAuthSubsystem { mgr.shutdown(); } - mAuthMgrPlugins.clear(); - mAuthMgrPlugins = null; mAuthMgrInsts.clear(); - mAuthMgrInsts = null; } public Hashtable<String, AuthMgrPlugin> getPlugins() { diff --git a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java index fa8696c1d..449a196d4 100644 --- a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java @@ -246,8 +246,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { public void shutdown() { try { // disconnect all outstanding connections in the factory - mConnFactory.reset(); - mConnFactory = null; + if (mConnFactory != null) mConnFactory.reset(); } catch (ELdapException e) { log(ILogger.LL_FAILURE, e.toString()); } diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 2c092f91c..a6019730a 100644 --- a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -414,9 +414,8 @@ public class AuthzSubsystem implements IAuthzSubsystem { * <P> */ public void shutdown() { - for (Enumeration<String> e = mAuthzMgrInsts.keys(); e.hasMoreElements();) { - - IAuthzManager mgr = get(e.nextElement()); + for (AuthzManagerProxy proxy : mAuthzMgrInsts.values()) { + IAuthzManager mgr = proxy.getAuthzManager(); //String infoMsg = // "Shutting down authz manager instance " + mgr.getName(); @@ -426,8 +425,6 @@ public class AuthzSubsystem implements IAuthzSubsystem { } mAuthzMgrPlugins.clear(); mAuthzMgrInsts.clear(); - mAuthzMgrPlugins = null; - mAuthzMgrInsts = null; } public Hashtable<String, AuthzMgrPlugin> getPlugins() { diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 4db850d2e..b0feca8c2 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -480,8 +480,6 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { * Stops this system. */ public synchronized void shutdown() { - mCa = null; - mPublisherProcessor = null; if (mLdapConnFactory != null) { try { mLdapConnFactory.reset(); @@ -489,7 +487,6 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { CMS.debug("CrossCertPairSubsystem shutdown exception: " + e.toString()); } } - mLdapConnFactory = null; } /* diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 2b6a63a62..653850e02 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -114,12 +114,8 @@ public class DBRegistry implements IDBRegistry, ISubsystem { */ public void shutdown() { mOCclassNames.clear(); - mOCclassNames = null; mOCldapNames.clear(); - mOCldapNames = null; mAttrufNames.clear(); - mAttrufNames = null; - mConverter = null; } /** diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index c0bb627c2..0824cc9a7 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -833,7 +833,6 @@ public class DBSubsystem implements IDBSubsystem { try { if (mLdapConnFactory != null) { mLdapConnFactory.reset(); - mLdapConnFactory = null; } } catch (ELdapException e) { diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 50ed7c3c2..5df29c10c 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -408,10 +408,11 @@ public class PublisherProcessor implements CMS.debug("No LdapPublishing enabled"); } + LdapRequestListener listener = null; if (mConfig.getBoolean(PROP_ENABLE, false)) { - mLdapRequestListener = new LdapRequestListener(); - mLdapRequestListener.init(this, mLdapConfig); - mAuthority.registerRequestListener(mLdapRequestListener); + listener = new LdapRequestListener(); + listener.init(this, mLdapConfig); + mAuthority.registerRequestListener(listener); IConfigStore queueConfig = mConfig.getSubStore(PROP_QUEUE_PUBLISH_SUBSTORE); if (queueConfig != null) { boolean isPublishingQueueEnabled = queueConfig.getBoolean("enable", false); @@ -431,6 +432,7 @@ public class PublisherProcessor implements savePublishingStatus); } } + mLdapRequestListener = listener; } public void shutdown() { @@ -439,7 +441,7 @@ public class PublisherProcessor implements if (mLdapConnModule != null) { mLdapConnModule.getLdapConnFactory().reset(); } - if (mLdapRequestListener != null) { + if (mAuthority != null && mLdapRequestListener != null) { //mLdapRequestListener.shutdown(); mAuthority.removeRequestListener(mLdapRequestListener); } diff --git a/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/common/src/com/netscape/cmscore/logging/LogQueue.java index 2a63fe478..32af1bf2c 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -66,7 +66,6 @@ public class LogQueue implements ILogQueue { for (int i = 0; i < mListeners.size(); i++) { mListeners.elementAt(i).shutdown(); } - mListeners = null; } /** diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 1ec3c009a..27e72352e 100644 --- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -216,11 +216,9 @@ public class ProfileSubsystem implements IProfileSubsystem { * <P> */ public void shutdown() { - mProfileIds.removeAllElements(); + mProfileIds.clear(); mProfiles.clear(); - mProfiles = null; mProfileClassIds.clear(); - mProfileClassIds = null; } /** diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java index 1c0146222..4e3593411 100644 --- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java +++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java @@ -246,7 +246,6 @@ public class PluginRegistry implements IPluginRegistry { */ public void shutdown() { mTypes.clear(); - mTypes = null; } /** diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index 259173078..1a29dcf0c 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -152,7 +152,6 @@ public final class UGSubsystem implements IUGSubsystem { try { if (mLdapConnFactory != null) { mLdapConnFactory.reset(); - mLdapConnFactory = null; } } catch (ELdapException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_LDAP_SHUT", e.toString())); |