From 74023634617762408423a44c8dd01ee050fef584 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 03 Jun 2013 09:13:08 +0000
Subject: [PATCH] Fix OPENDJ-866 Local RS is named differently to remote RS under cn=replication,cn=monitor
---
opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index 77853a8..60c1c75 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -709,13 +709,11 @@
for (DSInfo dsInfo : dsInfos)
{
LightweightServerHandler lsh = new LightweightServerHandler(this,
- serverId, dsInfo.getDsId(), dsInfo.getGenerationId(),
- dsInfo.getGroupId(), dsInfo.getStatus(), dsInfo.getRefUrls(),
- dsInfo.isAssured(), dsInfo.getAssuredMode(),
- dsInfo.getSafeDataLevel(),
- dsInfo.getEclIncludes(),
- dsInfo.getEclIncludesForDeletes(),
- dsInfo.getProtocolVersion());
+ serverId, dsInfo.getDsId(), dsInfo.getDsUrl(),
+ dsInfo.getGenerationId(), dsInfo.getGroupId(), dsInfo.getStatus(),
+ dsInfo.getRefUrls(), dsInfo.isAssured(), dsInfo.getAssuredMode(),
+ dsInfo.getSafeDataLevel(), dsInfo.getEclIncludes(),
+ dsInfo.getEclIncludesForDeletes(), dsInfo.getProtocolVersion());
lsh.startHandler();
remoteDirectoryServers.put(lsh.getServerId(), lsh);
}
@@ -779,10 +777,8 @@
@Override
public String getMonitorInstanceName()
{
- String str = serverURL + " " + String.valueOf(serverId);
-
- return "Connected Replication Server " + str +
- ",cn=" + replicationServerDomain.getMonitorInstanceName();
+ return "Connected replication server RS(" + serverId + ") " + serverURL
+ + ",cn=" + replicationServerDomain.getMonitorInstanceName();
}
/**
--
Gitblit v1.10.0