From e0a9d18288e1f8823fea550b8bca955dad4b1d13 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 22 Aug 2013 10:15:50 +0000
Subject: [PATCH] ReplicationServerHandler.java: Fixed broken early exit.
---
opends/src/server/org/opends/server/replication/server/ServerHandler.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index 0fd8857..0fba18d 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -238,9 +238,8 @@
*/
protected void abortStart(Message reason)
{
- // 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
+ // 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
Session localSession = session;
if (localSession != null)
{
@@ -250,10 +249,9 @@
releaseDomainLock();
// If generation id of domain was changed, set it back to old value
- // We may have changed it as it was -1 and we received a value >0 from
- // peer server and the last topo message sent may have failed being
- // sent: in that case retrieve old value of generation id for
- // replication server domain
+ // We may have changed it as it was -1 and we received a value >0 from peer
+ // server and the last topo message sent may have failed being sent: in that
+ // case retrieve old value of generation id for replication server domain
if (oldGenerationId != -100 && replicationServerDomain != null)
{
replicationServerDomain.changeGenerationId(oldGenerationId, false);
@@ -882,9 +880,8 @@
{
if (rcvWindow > 0)
{
- // The LDAP server believes that its window is closed
- // while it is not, this means that some problem happened in the
- // window exchange procedure !
+ // The LDAP server believes that its window is closed while it is not,
+ // this means that some problem happened in the window exchange procedure!
// lets update the LDAP server with out current window size and hope
// that everything will work better in the future.
// TODO also log an error message.
@@ -967,8 +964,6 @@
{
session.close();
}
-
- // Stop the heartbeat thread.
if (heartbeatThread != null)
{
heartbeatThread.shutdown();
--
Gitblit v1.10.0