From 20396bec93ad0de9b6cefee7c7b1ad628d6ea1ae Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Sep 2013 15:17:14 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
index a99057d..9b599d1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
@@ -153,6 +153,8 @@
{
try
{
+ String baseDN = domain.getBaseDN().toNormalizedString();
+
// Prevent out of band monitor responses from updating our pending
// table until we are ready.
synchronized (pendingMonitorDataLock)
@@ -182,7 +184,7 @@
{
// Log a message and do a best effort from here.
Message message = ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST.get(
- domain.getBaseDn(), serverId, e.getMessage());
+ baseDN, serverId, e.getMessage());
logError(message);
}
}
@@ -206,8 +208,7 @@
// error log with repeated messages.
if (!pendingMonitorDataServerIDs.contains(serverId))
{
- logError(NOTE_MONITOR_DATA_RECEIVED.get(
- domain.getBaseDn(), serverId));
+ logError(NOTE_MONITOR_DATA_RECEIVED.get(baseDN, serverId));
}
}
@@ -219,7 +220,7 @@
if (!monitorDataLateServers.contains(serverId))
{
logError(WARN_MISSING_REMOTE_MONITOR_DATA.get(
- domain.getBaseDn(), serverId));
+ baseDN, serverId));
}
}
@@ -313,8 +314,8 @@
{
// This is a response for an earlier request whose computing is
// already complete.
- logError(INFO_IGNORING_REMOTE_MONITOR_DATA.get(domain.getBaseDn(),
- msg.getSenderID()));
+ logError(INFO_IGNORING_REMOTE_MONITOR_DATA.get(
+ domain.getBaseDN().toNormalizedString(), msg.getSenderID()));
return;
}
--
Gitblit v1.10.0