From 599c307ea27723bd289516103d4162c56fed7f8e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 11 Mar 2014 16:56:01 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index 6f133da..fd35864 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -1082,7 +1082,7 @@
       }
 
        //The attribute is not being ignored so check for binary option.
-      if(checkSchema && !attrType.isBinary())
+      if(checkSchema && !attrType.getSyntax().isBEREncodingRequired())
       {
        if(attribute.hasOption("binary"))
         {
@@ -1371,7 +1371,7 @@
       builder = new AttributeBuilder(attrDescr);
     }
 
-    if(builder.getAttributeType().isBinary())
+    if(builder.getAttributeType().getSyntax().isBEREncodingRequired())
     {
       //resetting doesn't hurt and returns false.
       builder.setOption("binary");

--
Gitblit v1.10.0