From e6213080a8f2332df41d85c42e855a881b27a007 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Dec 2013 10:58:27 +0000
Subject: [PATCH] OPENDJ-1217 Servers not synchronized after a conflicting replace on multi-valued attribute on 2 different servers
---
opends/src/server/org/opends/server/replication/server/MessageHandler.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index d94821e..beaa3b0 100644
--- a/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -459,9 +459,13 @@
{
cursor = replicationServerDomain.getCursorFrom(serverState);
cursor.next();
- return cursor.getRecord().getCSN();
+ if (cursor.getRecord() != null)
+ {
+ return cursor.getRecord().getCSN();
+ }
+ return null;
}
- catch (Exception e)
+ catch (ChangelogException e)
{
return null;
}
--
Gitblit v1.10.0