From 32b028879371c5786d959504d97c93c22280a304 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 30 Oct 2013 14:24:06 +0000
Subject: [PATCH] DSInfo.java: Added cloneWithReplicationServerId().
---
opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 18d1730..492af17 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -1592,15 +1592,14 @@
*/
private void waitForRemoteStartOfInit()
{
- int waitResultAttempt = 0;
- Set<Integer> replicasWeAreWaitingFor = new HashSet<Integer>(0);
-
- replicasWeAreWaitingFor.addAll(ieContext.startList);
+ final Set<Integer> replicasWeAreWaitingFor =
+ new HashSet<Integer>(ieContext.startList);
if (debugEnabled())
TRACER.debugInfo(
"[IE] wait for start replicasWeAreWaitingFor=" + replicasWeAreWaitingFor);
+ int waitResultAttempt = 0;
boolean done;
do
{
@@ -1609,7 +1608,7 @@
{
if (debugEnabled())
TRACER.debugInfo(
- "[IE] wait for start dsid " + dsi.getDsId()
+ "[IE] wait for start dsId " + dsi.getDsId()
+ " " + dsi.getStatus()
+ " " + dsi.getGenerationId()
+ " " + getGenerationID());
@@ -1651,8 +1650,8 @@
*/
private void waitForRemoteEndOfInit()
{
- Set<Integer> replicasWeAreWaitingFor = new HashSet<Integer>(
- ieContext.startList);
+ final Set<Integer> replicasWeAreWaitingFor =
+ new HashSet<Integer>(ieContext.startList);
if (debugEnabled())
TRACER.debugInfo(
@@ -1670,8 +1669,8 @@
do
{
done = true;
- short reconnectMaxDelayInSec = 10;
- short reconnectWait = 0;
+ int reconnectMaxDelayInSec = 10;
+ int reconnectWait = 0;
Iterator<Integer> it = replicasWeAreWaitingFor.iterator();
while (it.hasNext())
{
@@ -1735,8 +1734,6 @@
if (debugEnabled())
TRACER.debugInfo(
"[IE] wait for end ends with " + ieContext.failureList);
-
-
}
/**
--
Gitblit v1.10.0