Backout part of fix for OpenDJ-95 as it was preventing the ECL from working...

Matthew Swift

25.07.2011 2c8cf2f7080321ad1c3d80bf51c82e4c08aa5a77

Backout part of fix for OpenDJ-95 as it was preventing the ECL from working properly

 opends/src/server/org/opends/server/replication/server/ECLServerHandler.java

@@ -1551,10 +1551,9 @@
      // INIT_PHASE is done AND search is persistent => goto PERSISTENT_PHASE
      searchPhase = PERSISTENT_PHASE;

      final ProtocolSession localSession = session;
      if (writer ==null && localSession != null)
      if (writer ==null)
      {
        writer = new ECLServerWriter(localSession,this,replicationServerDomain);
        writer = new ECLServerWriter(session,this,replicationServerDomain);
        writer.start();  // start suspended
      }


 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;