From ca8d415a2d4a5cd114b49c59ef5d8d380d0f2cb8 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 03 Dec 2013 15:15:24 +0000
Subject: [PATCH] Fix for OPENDJ-1239 – dsreplication logs warnings for each replication server under cn=monitor. Don't check server-id for replication servers.
---
opends/src/ads/org/opends/admin/ads/TopologyCache.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/TopologyCache.java b/opends/src/ads/org/opends/admin/ads/TopologyCache.java
index 475a322..797894d 100644
--- a/opends/src/ads/org/opends/admin/ads/TopologyCache.java
+++ b/opends/src/ads/org/opends/admin/ads/TopologyCache.java
@@ -494,8 +494,13 @@
int replicaId = -1;
try
{
- replicaId =
- new Integer(ConnectionUtils.getFirstValue(sr, "server-id"));
+ String sid = ConnectionUtils.getFirstValue(sr, "server-id");
+ if (sid == null)
+ {
+ // This is not a replica, but a replication server. Skip it
+ continue;
+ }
+ replicaId = new Integer(sid);
}
catch (Throwable t)
{
--
Gitblit v1.10.0