From 2399f6228004092d3c9ff23dc45f211978fdedbf Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Thu, 02 May 2013 12:07:19 +0000
Subject: [PATCH] CR-1612 Fix OPENDJ-886 connected-to attributes under cn=monitor are wrong when all RSes are down
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 6 +++++-
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index 5dea96a..961bf7d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-sdk/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;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index d981142..cf49fc3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-sdk/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;
}
/**
--
Gitblit v1.10.0