From 61936a7099192c2f3d2814a3ca5e0646ef37675c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 11:43:01 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index cd4f9f1..7cf9b44 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -50,7 +50,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Reject;
import org.opends.admin.ads.ADSContext;
@@ -77,7 +79,6 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.SelectableCertificateKeyManager;
import org.opends.server.util.ServerConstants;
@@ -519,7 +520,7 @@
InternalSearchOperation searchOp = icc.processSearch(
entryDN,
SearchScope.BASE_OBJECT,
- DereferencePolicy.NEVER_DEREF_ALIASES,
+ DereferenceAliasesPolicy.NEVER,
/* size limit */ 0, /* time limit */ 0,
/* types only */ false,
SearchFilter.createFilterFromString(
@@ -651,7 +652,7 @@
try {
final InternalSearchOperation searchOp
= icc.processSearch( entryDN, SearchScope.BASE_OBJECT,
- DereferencePolicy.NEVER_DEREF_ALIASES,
+ DereferenceAliasesPolicy.NEVER,
/* size limit */ 0, /* time limit */ 0,
/* types only */ false,
SearchFilter.createFilterFromString(
@@ -729,7 +730,7 @@
InternalSearchOperation searchOp = icc.processSearch(
instanceKeysDN,
SearchScope.SINGLE_LEVEL,
- DereferencePolicy.NEVER_DEREF_ALIASES,
+ DereferenceAliasesPolicy.NEVER,
/* size limit */ 0, /* time limit */ 0,
/* types only */ false,
SearchFilter.createFilterFromString(searchFilter),
--
Gitblit v1.10.0