From 504030134cca01d0f22a7046e157ad31ee064c13 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Fri, 16 Sep 2016 14:20:34 +0000
Subject: [PATCH] OPENDJ-3309 Better handling of unexpected messages in the ReplicationServer listener thread
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java | 4 +++-
opendj-server-legacy/src/messages/org/opends/messages/replication.properties | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index c6540ad..f4d646c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -274,8 +274,10 @@
// We did not recognize the message, close session as what
// can happen after is undetermined and we do not want the server to
// be disturbed
+ logger.error(ERR_REPLICATION_UNEXPECTED_MESSAGE,
+ session.getRemoteAddress().toString(),
+ (msg == null) ? "(null)" : msg.getClass().getSimpleName());
session.close();
- return;
}
}
catch (Exception e)
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
index 5f652fb..917e964 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
@@ -596,3 +596,5 @@
in domain "%s" from this directory server DS(%d): no remote directory servers exist
ERR_FULL_UPDATE_MISSING_REMOTE_299=Cannot start total update \
in domain "%s" from this directory server DS(%d): the remote directory server DS(%d) is unknown
+ERR_REPLICATION_UNEXPECTED_MESSAGE_300=New replication connection from %s started with unexpected message %s and is \
+ being closed
--
Gitblit v1.10.0