This fixes 2724 : and enable/fix some more replication tests.

gbellato

10.57.2007 37d94bc7fc4991912f2c0d87730ac8c3c26ab00d

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

@@ -53,7 +53,6 @@
package org.opends.server.replication.server;

import org.opends.messages.*;
import org.opends.messages.MessageBuilder;

import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -73,6 +72,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;

import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
@@ -167,6 +167,11 @@
   */
  HeartbeatThread heartbeatThread = null;

  /**
   * Set when ServerHandler is stopping.
   */
  private boolean shutdown = false;

  private static final Map<ChangeNumber, ReplServerAckMessageList>
   changelogsWaitingAcks =
       new HashMap<ChangeNumber, ReplServerAckMessageList>();
@@ -1012,13 +1017,13 @@
    do {
      try
      {
        sendWindow.acquire();
        sendWindow.tryAcquire((long)500, TimeUnit.MILLISECONDS);
        interrupted = false;
      } catch (InterruptedException e)
      {
        // loop until not interrupted
      }
    } while (interrupted);
    } while ((interrupted) && (!shutdown));
    this.incrementOutCount();
    return msg;
  }
@@ -1504,6 +1509,7 @@
   */
  public void shutdown()
  {
    shutdown  = true;
    try
    {
      session.close();