mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

mrossign
21.36.2008 4b7b965884bbcb0f54841ae4805790a85adc6688
Fix for randomly failing replication test (stuck while waiting for some thread death)
1 files modified
12 ■■■■ changed files
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java 12 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -212,13 +212,13 @@
  {
    ReplicationDomain domain = domains.remove(dn);
    if (domain != null)
      domain.shutdown();
    // No replay threads running if no replication need
    if (domains.size() == 0) {
      stopReplayThreads();
    }
    if (domain != null)
      domain.shutdown();
  }
  /**
@@ -507,9 +507,6 @@
  @Override
  public void finalizeSynchronizationProvider()
  {
    // Stop replay threads
    stopReplayThreads();
    // shutdown all the domains
    for (ReplicationDomain domain : domains.values())
    {
@@ -517,6 +514,9 @@
    }
    domains.clear();
    // Stop replay threads
    stopReplayThreads();
    // shutdown the ReplicationServer Service if necessary
    if (replicationServerListener != null)
      replicationServerListener.shutdown();