From 52015235de899f6960c7364e4990aa013327b874 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 14:59:00 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute
---
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index 61ba513..162752b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -826,7 +826,7 @@
//The attribute is not being ignored so check for binary option.
if (checkSchema
&& !attrType.getSyntax().isBEREncodingRequired()
- && attribute.getAttributeDescription().hasOption("binary"))
+ && attrDesc.hasOption("binary"))
{
LocalizableMessage message = ERR_LDIF_INVALID_ATTR_OPTION.get(
entryDN, lastEntryLineNumber, attrName);
@@ -867,7 +867,7 @@
final List<AttributeBuilder> attrList = attrBuilders.get(attrType);
if (attrList == null)
{
- AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ AttributeBuilder builder = new AttributeBuilder(attrDesc);
builder.add(attributeValue);
attrBuilders.put(attrType, newArrayList(builder));
return;
@@ -900,7 +900,7 @@
// No set of matching options was found, so create a new one and
// add it to the list.
- AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ AttributeBuilder builder = new AttributeBuilder(attrDesc);
builder.add(attributeValue);
attrList.add(builder);
}
@@ -951,7 +951,7 @@
ByteString value = parseSingleValue(lines, line, entryDN,
colonPos, attrName);
- AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ AttributeBuilder builder = new AttributeBuilder(attribute.getAttributeDescription());
builder.add(value);
return builder.toAttribute();
}
@@ -1332,7 +1332,7 @@
// Now go through the rest of the attributes till the "-" line is reached.
Attribute modAttr = LDIFReader.parseAttrDescription(attrDescr);
- AttributeBuilder builder = new AttributeBuilder(modAttr, true);
+ AttributeBuilder builder = new AttributeBuilder(modAttr.getAttributeDescription());
while (! lines.isEmpty())
{
line = lines.remove();
--
Gitblit v1.10.0