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/DataServerHandler.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index bb23940..63a15fe 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -346,10 +346,8 @@
@Override
public String getMonitorInstanceName()
{
- String str = serverURL + " " + String.valueOf(serverId);
-
- return "Connected Replica " + str +
- ",cn=" + replicationServerDomain.getMonitorInstanceName();
+ return "Connected directory server DS(" + serverId + ") " + serverURL
+ + ",cn=" + replicationServerDomain.getMonitorInstanceName();
}
/**
@@ -662,8 +660,7 @@
*/
public DSInfo toDSInfo()
{
-
- return new DSInfo(serverId, replicationServerId, generationId,
+ return new DSInfo(serverId, serverURL, replicationServerId, generationId,
status, assuredFlag, assuredMode, safeDataLevel, groupId, refUrls,
eclIncludes, eclIncludesForDeletes, protocolVersion);
}
--
Gitblit v1.10.0