From 07347aac048a14dc5fa1a5c1d02426230622051d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 02 Aug 2013 13:26:30 +0000
Subject: [PATCH] serviceId => baseDN (To make the code less confusing)
---
opends/src/server/org/opends/server/replication/server/ECLServerWriter.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
index c2dd931..6387180 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
@@ -26,11 +26,11 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.server;
+
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.IOException;
import java.net.SocketException;
@@ -49,7 +49,6 @@
import org.opends.server.workflowelement.externalchangelog.ECLSearchOperation;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
-
/**
* This class defines a server writer, which is used to send changes to a
* directory server.
@@ -136,6 +135,7 @@
* Loops waiting for changes from the ReplicationServerDomain and
* forward them to the other servers
*/
+ @Override
public void run()
{
try
@@ -176,7 +176,7 @@
handler.getReplicationServerId(),
handler.getServerId(),
session.getReadableRemoteAddress(),
- handler.getServiceId());
+ handler.getBaseDN());
}
else
{
@@ -184,7 +184,7 @@
handler.getReplicationServerId(),
handler.getServerId(),
session.getReadableRemoteAddress(),
- handler.getServiceId());
+ handler.getBaseDN());
}
logError(errMessage);
}
@@ -194,8 +194,7 @@
// An unexpected error happened.
// Log an error and close the connection.
Message errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION
- .get(handler.toString() + " "
- + stackTraceToSingleLineString(e));
+ .get(handler + " " + stackTraceToSingleLineString(e));
logError(errMessage);
}
finally
--
Gitblit v1.10.0