From 5c1781321a571986f9a1f4fcdf3e332076ee4c83 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Feb 2016 14:50:55 +0000
Subject: [PATCH] Use AttributeDescription in Entry and Attribute

---
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 39863de..5cc4904 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -170,7 +170,7 @@
             modsIterator.remove();
           }
           else if (newValue != null &&
-              !modifiedEntry.hasValue(type, modAttr.getOptions(), newValue))
+              !modifiedEntry.hasValue(modAttr.getAttributeDescription(), newValue))
           {
             conflict = true;
             modsIterator.remove();

--
Gitblit v1.10.0