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/plugins/ReferentialIntegrityPlugin.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index a90f64a..27c9658 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -734,7 +734,7 @@
if(e.hasAttribute(type))
{
ByteString value = ByteString.valueOfUtf8(oldEntryDN.toString());
- if (e.hasValue(type, null, value))
+ if (e.hasValue(type, value))
{
mods.add(new Modification(ModificationType.DELETE, Attributes
.create(type, value)));
@@ -1071,10 +1071,7 @@
break;
}
- AttributeType attrType = mod.getAttribute().getAttributeType();
- Set<String> attrOptions = mod.getAttribute().getOptions();
- Attribute modifiedAttribute = entry.getExactAttribute(attrType,
- attrOptions);
+ Attribute modifiedAttribute = entry.getExactAttribute(mod.getAttribute().getAttributeDescription());
if (modifiedAttribute != null)
{
PluginResult.PreOperation result =
--
Gitblit v1.10.0