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/LDIFBackend.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index 24e3fe7..2d7ad26 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -221,7 +221,7 @@
                        stackTraceToSingleLineString(e));
       DirectoryServer.sendAlertNotification(this,
                            ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                    m, e);
     }
 
@@ -243,7 +243,7 @@
                          stackTraceToSingleLineString(e));
         DirectoryServer.sendAlertNotification(this,
                              ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
-        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                      m, e);
       }
     }
@@ -264,7 +264,7 @@
                        stackTraceToSingleLineString(e));
       DirectoryServer.sendAlertNotification(this,
                            ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                    m, e);
     }
 
@@ -276,7 +276,7 @@
                        currentConfig.dn());
       DirectoryServer.sendAlertNotification(this,
                            ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m);
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m);
     }
 
     if (tempFile.exists())
@@ -320,7 +320,7 @@
                        stackTraceToSingleLineString(e));
       DirectoryServer.sendAlertNotification(this,
                            ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                    m, e);
     }
   }
@@ -982,7 +982,7 @@
         {
           LocalizableMessage m =
               ERR_LDIF_BACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(entryDN, stackTraceToSingleLineString(e));
-          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
+          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
         }
       }
     }
@@ -1006,7 +1006,7 @@
     {
       logger.traceException(e);
       LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_CREATE_LDIF_WRITER.get(stackTraceToSingleLineString(e));
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
     }
   }
 
@@ -1058,7 +1058,7 @@
               LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_READING_LDIF.get(
                                stackTraceToSingleLineString(le));
               throw new DirectoryException(
-                             DirectoryServer.getServerErrorResultCode(), m, le);
+                             DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, le);
             }
             continue;
           }
@@ -1132,7 +1132,7 @@
       catch (Exception e)
       {
         LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_READING_LDIF.get(stackTraceToSingleLineString(e));
-        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
+        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
       }
     }
     finally
@@ -1162,7 +1162,7 @@
     catch (Exception e)
     {
       LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_CREATE_LDIF_READER.get(stackTraceToSingleLineString(e));
-      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
+      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
     }
   }
 

--
Gitblit v1.10.0