summaryrefslogtreecommitdiffstats
path: root/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java')
-rw-r--r--base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
index 46b835472..a6133310c 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -35,6 +35,7 @@ import netscape.security.x509.CertificateValidity;
import com.netscape.certsrv.apps.CMS;
import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.base.EPropertyNotDefined;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.ISubsystem;
import com.netscape.certsrv.dbs.EDBException;
@@ -648,17 +649,29 @@ public class DBSubsystem implements IDBSubsystem {
try {
mLdapConnFactory.init(tmpConfig);
+
+ } catch (EPropertyNotDefined e) {
+ if (CMS.isPreOpMode()) {
+ CMS.debug("DBSubsystem: Ignore EPropertyNotDefined during pre-op: " + e);
+ return;
+ }
+
+ CMS.debug(e);
+ throw e;
+
} catch (ELdapServerDownException e) {
CMS.debug(e);
if (CMS.isPreOpMode())
return;
throw new EDBNotAvailException(
CMS.getUserMessage("CMS_DBS_INTERNAL_DIR_UNAVAILABLE"));
+
} catch (ELdapException e) {
CMS.debug(e);
if (CMS.isPreOpMode())
return;
throw new EDBException(CMS.getUserMessage("CMS_DBS_INTERNAL_DIR_ERROR", e.toString()));
+
} catch (EBaseException e) {
CMS.debug(e);
if (CMS.isPreOpMode())