CR-1612 Fix OPENDJ-886 connected-to attributes under cn=monitor are wrong w...

Chris Ridd

02.07.2013 5f04e2771954735e8c79189f9b11aaf5939f9195

CR-1612 Fix OPENDJ-886 connected-to attributes under cn=monitor are wrong when all RSes are down

 opends/src/server/org/opends/server/replication/service/ReplicationBroker.java

@@ -88,7 +88,8 @@
   */
  private volatile Collection<String> replicationServerUrls;
  private volatile boolean connected = false;
  private volatile String replicationServer = "Not connected";
  public final static String NO_CONNECTED_SERVER = "Not connected";
  private volatile String replicationServer = NO_CONNECTED_SERVER;
  private volatile ProtocolSession session = null;
  private final ServerState state;
  private final String baseDn;
@@ -970,6 +971,9 @@
         * This server could not find any replicationServer. It's going to start
         * in degraded mode. Log a message.
         */
        connected = false;
        replicationServer = NO_CONNECTED_SERVER;

        if (!connectionError)
        {
          connectionError = true;

 opends/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -2765,7 +2765,7 @@
    if (broker != null)
      return broker.getReplicationServer();
    else
      return "Not connected";
      return ReplicationBroker.NO_CONNECTED_SERVER;
  }

  /**