Bugzilla Bug# 852855 - rhcs81 - remove unexpected anonymous binds to internal db in cert status thread.

1 files changed, 19 insertions, 17 deletions

diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index e5eac3b93..132de912f 100644
--- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -342,28 +342,11 @@ public class CMSEngine implements ICMSEngine {
         mOwner = owner;
         mConfig = config;
         int state = mConfig.getInteger("cs.state");
-        String sd = mConfig.getString("securitydomain.select", "");
         // my default is 1 day
         String flush_timeout = config.getString("securitydomain.flushinterval", "86400000");
         String secdomain_source = config.getString("securitydomain.source", "memory");
         String secdomain_check_interval = config.getString("securitydomain.checkinterval", "5000");
 
-        if ((state == 1) && (!sd.equals("existing"))) {
-            // check session domain table only if this is a
-            // configured security domain host
-
-            if (secdomain_source.equals("ldap")) {
-                mSecurityDomainSessionTable = new LDAPSecurityDomainSessionTable((new Long(flush_timeout)).longValue());
-            } else {
-                mSecurityDomainSessionTable = new SecurityDomainSessionTable((new Long(flush_timeout)).longValue());
-            }
-
-            mSDTimer = new Timer();
-            SessionTimer timertask = new SessionTimer(mSecurityDomainSessionTable);
-
-            mSDTimer.schedule(timertask, 5, (new Long(secdomain_check_interval)).longValue());
-        }
-
         String tsClass = config.getString("timeSourceClass", null);
 
         if (tsClass != null) {
@@ -413,6 +396,25 @@ public class CMSEngine implements ICMSEngine {
         }
         parseServerXML();
         fixProxyPorts();
+
+        String sd = mConfig.getString("securitydomain.select", "");
+
+        if ((state == 1) && (!sd.equals("existing"))) {
+            // check session domain table only if this is a
+            // configured security domain host
+
+            if (secdomain_source.equals("ldap")) {
+                mSecurityDomainSessionTable = new LDAPSecurityDomainSessionTable((new Long(flush_timeout)).longValue());
+            } else {
+                mSecurityDomainSessionTable = new SecurityDomainSessionTable((new Long(flush_timeout)).longValue());
+            }
+
+            mSDTimer = new Timer();
+            SessionTimer timertask = new SessionTimer(mSecurityDomainSessionTable);
+
+            mSDTimer.schedule(timertask, 5, (new Long(secdomain_check_interval)).longValue());
+        }
+
     }
 
     /**