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/backends/SchemaBackend.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 2f15fa5..721c1e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -1573,7 +1573,7 @@
LocalizableMessage message = ERR_SCHEMA_UNABLE_TO_CREATE_LDIF_WRITER.get(
stackTraceToSingleLineString(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
message);
}
@@ -1589,7 +1589,7 @@
LocalizableMessage message =
ERR_SCHEMA_UNABLE_TO_EXPORT_BASE.get(stackTraceToSingleLineString(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
message);
}
finally
@@ -1638,7 +1638,7 @@
if (! le.canContinueReading())
{
throw new DirectoryException(
- DirectoryServer.getServerErrorResultCode(),
+ DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
}
continue;
@@ -1657,7 +1657,7 @@
}
catch (Exception e)
{
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
}
}
@@ -1670,7 +1670,7 @@
}
catch (Exception e)
{
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
}
}
@@ -1744,7 +1744,7 @@
ccr.addMessage(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
configEntryDN, getExceptionMessage(e)));
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
newBaseDNs = null;
}
@@ -1761,7 +1761,7 @@
ccr.addMessage(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
configEntryDN, stackTraceToSingleLineString(e)));
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
}
if (ccr.getResultCode() == ResultCode.SUCCESS)
@@ -1791,7 +1791,7 @@
logger.traceException(e);
ccr.addMessage(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
}
}
@@ -1808,7 +1808,7 @@
logger.traceException(e);
ccr.addMessage(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
- ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
}
}
--
Gitblit v1.10.0