From 74a8cf4940910e17a9bcc6073ffa47e7f5faa7b0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 20 Dec 2013 11:57:21 +0000
Subject: [PATCH] Fixed continuous integration tests failure with FractionalReplicationTest.
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index c1e4c4f..87f63fe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -81,6 +81,7 @@
/** The info of the RS we are connected to. */
private final ReplicationServerInfo rsInfo;
+ /** Contains a connected session to the RS if any exist, null otherwise. */
private final Session session;
private final String replicationServer;
@@ -982,7 +983,7 @@
final DN baseDN = getBaseDN();
final ReplicationServerInfo rsInfo = rs.rsInfo;
- boolean connectSuccessful = false;
+ boolean connectCompleted = false;
try
{
maxSendWindow = rsInfo.getWindowSize();
@@ -1042,8 +1043,7 @@
{
startChangeTimeHeartBeatPublishing(rs);
}
- setConnectedRS(rs);
- connectSuccessful = true;
+ connectCompleted = true;
}
catch (Exception e)
{
@@ -1053,7 +1053,7 @@
}
finally
{
- if (!connectSuccessful)
+ if (!connectCompleted)
{
setConnectedRS(ConnectedRS.noConnectedRS());
}
@@ -1349,6 +1349,7 @@
// Alright set the timeout to the desired value
session.setSoTimeout(timeout);
+ setConnectedRS(electedRS);
return topologyMsg;
}
catch (Exception e)
--
Gitblit v1.10.0