From b5e00f389cdbe725026e31e699fe6615ad0704d2 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 19 Apr 2011 22:26:33 +0000
Subject: [PATCH] Fix OpenDJ-121: Replication failure on startup due to generation ID of -1
---
opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index 9b0ac2b..320aacd 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -217,6 +217,15 @@
return;
}
+ // Since we are going to send the topology message before having received
+ // one, we need to set the generation ID as soon as possible if it is
+ // currently uninitialized. See OpenDJ-121.
+ if (localGenerationId < 0 && generationId > 0)
+ {
+ oldGenerationId = replicationServerDomain.changeGenerationId(
+ generationId, false);
+ }
+
// Log
logStartHandshakeSNDandRCV(outReplServerStartMsg,(ReplServerStartMsg)msg);
--
Gitblit v1.10.0