From ed847e95ab009b3f8a7b57636aa3bbe977bf875d Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Mon, 19 Oct 2009 07:56:29 +0000
Subject: [PATCH] Fix #4270 ECL Should not establish connections between RSes

---
 opends/src/server/org/opends/server/replication/server/ECLServerWriter.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 2567751..31ce932 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
@@ -193,7 +193,8 @@
           // Can't do much more : ignore
         }
       }
-      replicationServerDomain.stopServer(handler);
+      if (replicationServerDomain!=null)
+        replicationServerDomain.stopServer(handler);
     }
   }
 
@@ -243,7 +244,7 @@
             // session is null in pusherOnly mode
             // Done is used to end phase 1
             session.publish(new DoneMsg(
-                replicationServerDomain.getReplicationServer().getServerId(),
+                handler.getReplicationServerId(),
                 handler.getServerId()), protocolVersion);
           }
         }

--
Gitblit v1.10.0