From 64d86dcc54506df26269c2f4b69502c405ffa653 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Feb 2014 16:57:04 +0000
Subject: [PATCH] OPENDJ-1271 (CR-3008) dsreplication pre-external-initialization task fails with STOPPED_BY_ERROR

---
 opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index c5d2213..d68a04a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2013 ForgeRock AS
+ *      Portions copyright 2011-2014 ForgeRock AS
  */
 package org.opends.server.replication.server;
 
@@ -466,7 +466,7 @@
     if (getProtocolVersion() >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
     {
       // List should only contain RS info for sender
-      RSInfo rsInfo = inTopoMsg.getRsList().get(0);
+      RSInfo rsInfo = inTopoMsg.getRsInfos().get(0);
       weight = rsInfo.getWeight();
     }
 
@@ -603,7 +603,7 @@
   public void processTopoInfoFromRS(TopologyMsg topoMsg)
   {
     // List should only contain RS info for sender
-    final RSInfo rsInfo = topoMsg.getRsList().get(0);
+    final RSInfo rsInfo = topoMsg.getRsInfos().get(0);
     generationId = rsInfo.getGenerationId();
     groupId = rsInfo.getGroupId();
     weight = rsInfo.getWeight();
@@ -613,7 +613,7 @@
       clearRemoteLSHandlers();
 
       // Creates the new structure according to the message received.
-      for (DSInfo dsInfo : topoMsg.getDsList())
+      for (DSInfo dsInfo : topoMsg.getReplicaInfos().values())
       {
         // For each DS connected to the peer RS
         DSInfo clonedDSInfo = dsInfo.cloneWithReplicationServerId(serverId);

--
Gitblit v1.10.0