From ed847e95ab009b3f8a7b57636aa3bbe977bf875d Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Mon, 19 Oct 2009 07:56:29 +0000
Subject: [PATCH] Fix #4270 ECL Should not establish connections between RSes
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index b24c5e5..c0c6094 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -1596,11 +1596,9 @@
while (rsdi.hasNext())
{
ReplicationServerDomain domain = rsdi.next();
-
- if (excludedServiceIDs.contains(domain.getBaseDn()))
- {
+ if ((excludedServiceIDs != null) &&
+ excludedServiceIDs.contains(domain.getBaseDn()))
continue;
- }
ChangeNumber domainEligibleCN = domain.getEligibleCN();
String dates = "";
@@ -1830,6 +1828,9 @@
&& (excludedServiceIDs.contains(rsd.getBaseDn())))
continue;
+ if (rsd.getDbServerState().isEmpty())
+ continue;
+
result.update(rsd.getBaseDn(), rsd.getEligibleState(
getEligibleCN()));
}
--
Gitblit v1.10.0