From 06757db3aca209339126dd2fc0f5ecb859e649d1 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 12 Sep 2011 20:52:58 +0000
Subject: [PATCH] Fix to OPENDJ-274, resolve remaining nightly unit test failure with modifications of single valued attributes. Tidy up some of the unit-tests around that area, adding more controls, making sure tests stop services on failure and reducing time to run.
---
opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 826bacc..92ada58 100644
--- a/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -251,8 +251,7 @@
break;
case REPLACE:
- if ((changeNumber.older(deleteTime))
- && ((addTime == null) || (changeNumber.older(addTime))))
+ if (changeNumber.older(deleteTime))
{
conflict = true;
modsIterator.remove();
--
Gitblit v1.10.0