From 0bbb2f7f7f74de8b6a43523c88ae7eb8ff8b5e54 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 11 Mar 2014 09:41:21 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 08d62c9..296ec77 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -61,7 +61,7 @@
import org.opends.server.api.Backend;
import org.opends.server.backends.TrustStoreBackend;
import org.opends.server.config.ConfigConstants;
-import org.opends.server.config.ConfigException;
+import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
@@ -920,15 +920,19 @@
// Retrieve instance-key-pair private key part.
PrivateKey privateKey;
try {
- privateKey = (PrivateKey)getTrustStoreBackend()
+ privateKey = (PrivateKey) getTrustStoreBackend()
.getKey(ConfigConstants.ADS_CERTIFICATE_ALIAS);
}
+ catch(ConfigException ce)
+ {
+ throw new CryptoManagerException(
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(getExceptionMessage(ce)), ce);
+ }
catch (IdentifiedException ex) {
// ConfigException, DirectoryException
logger.traceException(ex);
throw new CryptoManagerException(
- ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(
- getExceptionMessage(ex)), ex);
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(getExceptionMessage(ex)), ex);
}
// Unwrap secret key.
--
Gitblit v1.10.0