From 2c8cf2f7080321ad1c3d80bf51c82e4c08aa5a77 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 25 Mar 2011 08:07:55 +0000
Subject: [PATCH] Backout part of fix for OpenDJ-95 as it was preventing the ECL from working properly

---
 opends/src/server/org/opends/server/replication/server/ServerWriter.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ServerWriter.java b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
index 6457b6a..54ed9a1 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -75,9 +75,14 @@
   public ServerWriter(ProtocolSession session, ServerHandler handler,
       ReplicationServerDomain replicationServerDomain)
   {
-    super("Replication server RS(" + handler.getReplicationServerId()
-        + ") writing to " + handler.toString() + " at "
-        + session.getReadableRemoteAddress());
+    // Session may be null for ECLServerWriter.
+    super("Replication server RS("
+        + handler.getReplicationServerId()
+        + ") writing to "
+        + handler.toString()
+        + " at "
+        + ((session != null) ? session.getReadableRemoteAddress()
+            : "unknown"));
 
     this.session = session;
     this.handler = handler;

--
Gitblit v1.10.0