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/api/CompressedSchema.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java b/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
index e8169e8..2866e88 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
@@ -46,11 +46,9 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.AttributeValues;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Attributes;
import org.forgerock.opendj.ldap.ByteSequenceReader;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ObjectClass;
@@ -143,8 +141,7 @@
final int valueLength = reader.getBERLength();
final ByteString valueBytes = reader.getByteSequence(valueLength)
.toByteString();
- return Attributes.create(attrType,
- AttributeValues.create(attrType, valueBytes));
+ return Attributes.create(attrType, valueBytes);
}
else
{
@@ -157,7 +154,7 @@
final int valueLength = reader.getBERLength();
final ByteString valueBytes = reader.getByteSequence(valueLength)
.toByteString();
- builder.add(AttributeValues.create(attrType, valueBytes));
+ builder.add(valueBytes);
}
return builder.toAttribute();
}
@@ -251,10 +248,10 @@
builder.appendBERLength(idBytes.length);
builder.append(idBytes);
builder.appendBERLength(attribute.size());
- for (final AttributeValue v : attribute)
+ for (final ByteString v : attribute)
{
- builder.appendBERLength(v.getValue().length());
- builder.append(v.getValue());
+ builder.appendBERLength(v.length());
+ builder.append(v);
}
}
--
Gitblit v1.10.0