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/ReplicationServerHandler.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index bb7baf1..823b2cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -22,27 +22,28 @@
*
*
* 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 static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.replication.protocol.ProtocolVersion.*;
+
import java.io.IOException;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.replication.common.DSInfo;
import org.opends.server.replication.common.RSInfo;
import org.opends.server.replication.common.ServerState;
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 static org.opends.server.replication.protocol.ProtocolVersion.*;
/**
* This class defines a server handler, which handles all interaction with a
@@ -53,10 +54,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /**
- * Properties filled only if remote server is a RS.
- */
+ /** Properties filled only if remote server is a RS. */
private String serverAddressURL;
/**
* this collection will contain as many elements as there are
@@ -514,7 +512,7 @@
* replicationServerDomain.setGenerationId(generationId, false);
*/
logger.warn(WARN_BAD_GENERATION_ID_FROM_RS, serverId, session.getReadableRemoteAddress(), generationId,
- getBaseDNString(), getReplicationServerId(), localGenerationId);
+ getBaseDN(), getReplicationServerId(), localGenerationId);
}
}
--
Gitblit v1.10.0