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/protocols/ldap/LDAPReader.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
index 473fd00..f8faf3f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
@@ -26,11 +26,17 @@
*/
package org.opends.server.protocols.ldap;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.types.*;
@@ -38,11 +44,6 @@
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-
/**
* Utility class used to decode LDAP messages from an ASN1Reader.
*/
@@ -1959,23 +1960,17 @@
}
- DereferencePolicy dereferencePolicy;
+ DereferenceAliasesPolicy dereferencePolicy;
try
{
int derefValue = (int)reader.readInteger();
switch (derefValue)
{
case DEREF_NEVER:
- dereferencePolicy = DereferencePolicy.NEVER_DEREF_ALIASES;
- break;
case DEREF_IN_SEARCHING:
- dereferencePolicy = DereferencePolicy.DEREF_IN_SEARCHING;
- break;
case DEREF_FINDING_BASE:
- dereferencePolicy = DereferencePolicy.DEREF_FINDING_BASE_OBJECT;
- break;
case DEREF_ALWAYS:
- dereferencePolicy = DereferencePolicy.DEREF_ALWAYS;
+ dereferencePolicy = DereferenceAliasesPolicy.valueOf(derefValue);
break;
default:
LocalizableMessage message =
--
Gitblit v1.10.0