From 2dece15900c587dcc5fcfaf35c2acdbfb026de1f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 14 Mar 2014 15:06:25 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 497350e..394d630 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
@@ -670,8 +669,10 @@
}
EntryIDSet entryIDList;
+
try
{
+ JebFormat.entryIDListFromDatabase(data.getData());
entryIDList = new EntryIDSet(key.getData(), data.getData());
}
catch (Exception e)
@@ -803,6 +804,7 @@
EntryIDSet entryIDList;
try
{
+ JebFormat.entryIDListFromDatabase(data.getData());
entryIDList = new EntryIDSet(key.getData(), data.getData());
}
catch (Exception e)
@@ -1092,6 +1094,7 @@
EntryIDSet entryIDList;
try
{
+ JebFormat.entryIDListFromDatabase(data.getData());
entryIDList = new EntryIDSet(key.getData(), data.getData());
}
catch (Exception e)
@@ -1627,7 +1630,7 @@
for (Attribute attr : attrList)
{
final AttributeType attrType = attr.getAttributeType();
- EqualityMatchingRule equalityRule = attrType.getEqualityMatchingRule();
+ MatchingRule equalityRule = attrType.getEqualityMatchingRule();
for (AttributeValue value : attr)
{
final ByteString bsValue = value.getValue();
--
Gitblit v1.10.0