From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index 6b3ce6b..c9c7ea7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -43,6 +43,7 @@
import org.opends.server.core.SchemaConfigManager;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -59,7 +60,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The list of files to be added to the server schema. */
- TreeSet<String> filesToAdd;
+ private TreeSet<String> filesToAdd;
/**
* {@inheritDoc}
@@ -111,9 +112,9 @@
filesToAdd = new TreeSet<String>();
for (Attribute a : attrList)
{
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
- String filename = v.getValue().toString();
+ String filename = v.toString();
filesToAdd.add(filename);
try
@@ -207,9 +208,9 @@
Attribute a = m.getAttribute();
AttributeBuilder builder = new AttributeBuilder(a
.getAttributeType(), a.getName());
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
- String s = v.getValue().toString();
+ String s = v.toString();
if (!s.contains(SCHEMA_PROPERTY_FILENAME))
{
if (s.endsWith(" )"))
@@ -224,7 +225,7 @@
}
}
- builder.add(AttributeValues.create(a.getAttributeType(), s));
+ builder.add(s);
}
mods.add(new Modification(m.getModificationType(), builder
--
Gitblit v1.10.0