From 46af3a54b9e7cd3bceea596bd7cba4ff5d19617e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 14 Sep 2016 13:16:21 +0000
Subject: [PATCH] OPENDJ-3296 Remove AttributeBuilder.setAttributeDescription()
---
opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java
index 89a2677..3c7c0c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java
@@ -54,7 +54,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.AVA;
-import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
@@ -421,16 +420,14 @@
private static void compareConcatenatedSchema(Set<String> oldElements, Set<String> newElements,
AttributeType elementType, List<Modification> mods)
{
- AttributeBuilder builder = new AttributeBuilder(elementType);
- addModification(mods, DELETE, oldElements, newElements, builder);
-
- builder.setAttributeDescription(AttributeDescription.create(elementType));
- addModification(mods, ADD, newElements, oldElements, builder);
+ addModification(mods, DELETE, oldElements, newElements, elementType);
+ addModification(mods, ADD, newElements, oldElements, elementType);
}
private static void addModification(List<Modification> mods, ModificationType modType, Set<String> included,
- Set<String> excluded, AttributeBuilder builder)
+ Set<String> excluded, AttributeType attrType)
{
+ AttributeBuilder builder = new AttributeBuilder(attrType);
for (String val : included)
{
if (!excluded.contains(val))
--
Gitblit v1.10.0