From b71a918506bf2bb0ed8fdc6fe0175ffbac5807e9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 05 Jan 2015 16:22:36 +0000
Subject: [PATCH] Remove getBaseDNString() methods.
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
index dfbcaec..bff6ce1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -22,13 +22,13 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
-import java.io.IOException;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
+import static org.opends.messages.ReplicationMessages.*;
+import java.io.IOException;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -37,18 +37,20 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.RSInfo;
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-
-import static org.opends.messages.ReplicationMessages.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.InitializationException;
/**
* This class defines a server handler :
@@ -510,7 +512,7 @@
List<Attribute> attributes = super.getMonitorData();
attributes.add(Attributes.create("server-id", String.valueOf(serverId)));
- attributes.add(Attributes.create("domain-name", getBaseDNString()));
+ attributes.add(Attributes.create("domain-name", String.valueOf(getBaseDN())));
// Deprecated
attributes.add(Attributes.create("max-waiting-changes", String
@@ -789,10 +791,7 @@
if (!lockAcquired)
{
LocalizableMessage message = WARN_TIMEOUT_WHEN_CROSS_CONNECTION.get(
- getBaseDNString(),
- serverId,
- session.getReadableRemoteAddress(),
- getReplicationServerId());
+ getBaseDN(), serverId, session.getReadableRemoteAddress(), getReplicationServerId());
throw new DirectoryException(ResultCode.OTHER, message);
}
}
@@ -1199,9 +1198,9 @@
if (isDataServer())
{
return ERR_DS_BADLY_DISCONNECTED.get(getReplicationServerId(),
- getServerId(), session.getReadableRemoteAddress(), getBaseDNString());
+ getServerId(), session.getReadableRemoteAddress(), getBaseDN());
}
return ERR_RS_BADLY_DISCONNECTED.get(getReplicationServerId(),
- getServerId(), session.getReadableRemoteAddress(), getBaseDNString());
+ getServerId(), session.getReadableRemoteAddress(), getBaseDN());
}
}
--
Gitblit v1.10.0