summaryrefslogtreecommitdiffstats
path: root/base/server/cmscore
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-04-07 10:11:30 -0400
committerEndi S. Dewata <edewata@redhat.com>2015-04-07 12:50:28 -0400
commit183281e30c0ceb8adc5942c9e3129f2fcee5b8a6 (patch)
treecea2e775dd68a3d0de2d6879292888260d07fb9f /base/server/cmscore
parent0183aa9e4525bcfb3bde7727ebe56ba4324c6eca (diff)
downloadpki-183281e30c0ceb8adc5942c9e3129f2fcee5b8a6.tar.gz
pki-183281e30c0ceb8adc5942c9e3129f2fcee5b8a6.tar.xz
pki-183281e30c0ceb8adc5942c9e3129f2fcee5b8a6.zip
Fixed missing port error during installation.
The DBSubsystem has been modified to ignore the EPropertyNotDefined exception in pre-op mode and only display a notification instead of a stack trace since it's part of a normal operation. The missing port will be supplied in a later stage of installation. https://fedorahosted.org/pki/ticket/1293
Diffstat (limited to 'base/server/cmscore')
-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())