From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/backends/LDIFBackend.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/LDIFBackend.java b/opends/src/server/org/opends/server/backends/LDIFBackend.java
index a4c8f8c..671a56d 100644
--- a/opends/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opends/src/server/org/opends/server/backends/LDIFBackend.java
@@ -1441,8 +1441,8 @@
currentConfig = (LDIFBackendCfg) config;
currentConfig.addLDIFChangeListener(this);
- baseDNs = new DN[currentConfig.getBackendBaseDN().size()];
- currentConfig.getBackendBaseDN().toArray(baseDNs);
+ baseDNs = new DN[currentConfig.getBaseDN().size()];
+ currentConfig.getBaseDN().toArray(baseDNs);
if (baseDNs.length != 1)
{
throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
@@ -1475,7 +1475,7 @@
boolean configAcceptable = true;
// Make sure that there is only a single base DN.
- if (configuration.getBackendBaseDN().size() != 1)
+ if (configuration.getBaseDN().size() != 1)
{
unacceptableReasons.add(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
configuration.dn().toString()));
@@ -1512,7 +1512,7 @@
if (baseDNSet != null)
{
- if (! baseDNSet.equals(configuration.getBackendBaseDN()))
+ if (! baseDNSet.equals(configuration.getBaseDN()))
{
messages.add(INFO_LDIF_BACKEND_BASE_DN_CHANGED.get());
adminActionRequired = true;
--
Gitblit v1.10.0