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/common/DSInfo.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/DSInfo.java b/opends/src/server/org/opends/server/replication/common/DSInfo.java
index 44e98c6..cf9a760 100644
--- a/opends/src/server/org/opends/server/replication/common/DSInfo.java
+++ b/opends/src/server/org/opends/server/replication/common/DSInfo.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -43,6 +43,8 @@
// DS server id
private int dsId = -1;
+ // DS server url
+ private String dsUrl;
// Server id of the RS the DS is connected to
private int rsId = -1;
// DS Generation Id
@@ -73,6 +75,7 @@
*
* @param dsId
* The DS id
+ * @param dsUrl Url of the DS
* @param rsId
* The RS id the DS is connected to
* @param generationId
@@ -96,13 +99,14 @@
* @param protocolVersion
* Protocol version supported by this server.
*/
- public DSInfo(int dsId, int rsId, long generationId,
+ public DSInfo(int dsId, String dsUrl, int rsId, long generationId,
ServerStatus status, boolean assuredFlag,
AssuredMode assuredMode, byte safeDataLevel, byte groupId,
List<String> refUrls, Set<String> eclIncludes,
Set<String> eclIncludesForDeletes, short protocolVersion)
{
this.dsId = dsId;
+ this.dsUrl = dsUrl;
this.rsId = rsId;
this.generationId = generationId;
this.status = status;
@@ -126,6 +130,15 @@
}
/**
+ * Get the DS URL.
+ * @return the DS URL
+ */
+ public String getDsUrl()
+ {
+ return dsUrl;
+ }
+
+ /**
* Get the RS id the DS is connected to.
* @return the RS id the DS is connected to
*/
@@ -298,6 +311,8 @@
StringBuilder sb = new StringBuilder();
sb.append("\nDS id: ");
sb.append(dsId);
+ sb.append(" ; DS url: ");
+ sb.append(dsUrl);
sb.append(" ; RS id: ");
sb.append(rsId);
sb.append(" ; Generation id: ");
--
Gitblit v1.10.0