From 6d1ebe16f8bfd23ef5de615dc7fab6468f7ef3f8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 24 Dec 2014 15:01:44 +0000
Subject: [PATCH] Code cleanup
---
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 336688c..368fa2a 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
@@ -452,8 +452,7 @@
preferredCipherTransformation = cfg.getCipherTransformation();
preferredCipherTransformationKeyLengthBits = cfg.getCipherKeyLength();
preferredKeyWrappingTransformation = cfg.getKeyWrappingTransformation();
- return new ConfigChangeResult(ResultCode.SUCCESS, false,
- new ArrayList<LocalizableMessage>());
+ return new ConfigChangeResult();
}
@@ -466,21 +465,16 @@
private TrustStoreBackend getTrustStoreBackend()
throws ConfigException
{
- Backend b = DirectoryServer.getBackend(
- ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
+ Backend<?> b = DirectoryServer.getBackend(ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
if (b == null)
{
- LocalizableMessage msg =
- ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_NOT_ENABLED.get(
- ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
- throw new ConfigException(msg);
+ throw new ConfigException(ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_NOT_ENABLED.get(
+ ConfigConstants.ID_ADS_TRUST_STORE_BACKEND));
}
if (!(b instanceof TrustStoreBackend))
{
- LocalizableMessage msg =
- ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_WRONG_CLASS.get(
- ConfigConstants.ID_ADS_TRUST_STORE_BACKEND);
- throw new ConfigException(msg);
+ throw new ConfigException(ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_WRONG_CLASS.get(
+ ConfigConstants.ID_ADS_TRUST_STORE_BACKEND));
}
return (TrustStoreBackend)b;
}
--
Gitblit v1.10.0