From 58df6f18fee34844ed7a92a84379e3ec2bebed6d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 21 Nov 2016 13:58:14 +0000
Subject: [PATCH] OPENDJ-3476 Remove getters for core configuration from DirectoryServer class
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index dc67410..3d74eac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -112,7 +112,7 @@
{
logger.traceException(e);
LocalizableMessage message = ERR_FILE_TRUSTMANAGER_CANNOT_LOAD.get(trustStoreFile, getExceptionMessage(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
}
try
@@ -134,7 +134,7 @@
LocalizableMessage message =
ERR_FILE_TRUSTMANAGER_CANNOT_CREATE_FACTORY.get(trustStoreFile, getExceptionMessage(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
}
}
@@ -186,7 +186,7 @@
final File f = getFileForPath(keyStoreFile);
if (!f.exists() || !f.isFile())
{
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
ccr.addMessage(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(keyStoreFile, cfg.dn()));
}
return keyStoreFile;
@@ -206,7 +206,7 @@
catch (KeyStoreException e)
{
logger.traceException(e);
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
ccr.addMessage(ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(trustStoreType, cfg.dn(), getExceptionMessage(e)));
}
}
@@ -230,7 +230,7 @@
}
catch (InitializationException e)
{
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
ccr.addMessage(e.getMessageObject());
return null;
}
--
Gitblit v1.10.0