From 8f6fbd3ef2ab09b4cd3e84f490838756d22695c1 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 13:11:05 +0000
Subject: [PATCH] Fix build issue with JDK5 and improve replication diagnostic through cn=Monitor, by providing the Replication server hostname
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 8 ++++++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java | 1 -
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 5137ba4..33a097d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -33,6 +33,7 @@
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -3029,8 +3030,15 @@
@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";
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
index 9b4fd91..9bfc700 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -488,7 +488,6 @@
ConfigurationDeleteListener<ExternalChangelogDomainCfg> listener)
{}
- @Override
public boolean isLogChangenumber()
{
return true;
--
Gitblit v1.10.0