From 5a872b4517410def8b08290ebd0645b053be4e32 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 31 May 2013 17:25:23 +0000
Subject: [PATCH] Fix for OPENDJ-875: Use of hostnames in replication protocol causes failover problems
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 88c9487..9237dbc 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -34,7 +34,6 @@
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.io.IOException;
-import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -3017,18 +3016,9 @@
@Override
public String getMonitorInstanceName()
{
- String hostname = "unknown";
- try
- {
- hostname = InetAddress.getLocalHost().getHostName();
- }
- catch (Exception e) {}
- return "Replication Server "
- + replicationServer.getReplicationPort() + " "
- + hostname
- + " " + replicationServer.getServerId()
- + ",cn=" + baseDn.replace(',', '_').replace('=', '_')
- + ",cn=replication";
+ return "Replication server RS(" + replicationServer.getServerId() + ") "
+ + replicationServer.getServerURL() + ",cn="
+ + baseDn.replace(',', '_').replace('=', '_') + ",cn=Replication";
}
/**
--
Gitblit v1.10.0