From e9a2437481b4d9105cb9b758d410a7b73cbcd767 Mon Sep 17 00:00:00 2001
From: mmarie <mmarie@localhost>
Date: Wed, 18 Feb 2009 08:14:52 +0000
Subject: [PATCH] Minimalistic replication-related changes - Fix for a typo in replication.properties - Avoid logging a message during shutdown (to avoid spurious traces)
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 10 +++++++---
opends/src/messages/messages/replication.properties | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties
index fa9597f..7d9587c 100644
--- a/opends/src/messages/messages/replication.properties
+++ b/opends/src/messages/messages/replication.properties
@@ -340,7 +340,7 @@
starting online full update for exporting suffix %s data to remote directory \
server %s
NOTICE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_144=Local directory server %s has \
- finished online full update for exporting suffix datat %s to remote directory \
+ finished online full update for exporting suffix data %s to remote directory \
server %s
NOTICE_TIMEOUT_WHEN_CROSS_CONNECTION_145=Timed out trying to acquire the domain \
lock for %s. Connection attempt from replication server %s to local replication \
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 679b953..98e6de4 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -275,9 +275,13 @@
{
// The socket has probably been closed as part of the
// shutdown or changing the port number process.
- // just log debug information and loop.
- Message message = ERR_EXCEPTION_LISTENING.get(e.getLocalizedMessage());
- logError(message);
+ // Just log debug information and loop.
+ // Do not log the message during shutdown.
+ if (shutdown == false) {
+ Message message =
+ ERR_EXCEPTION_LISTENING.get(e.getLocalizedMessage());
+ logError(message);
+ }
}
}
}
--
Gitblit v1.10.0