From 18320d54c115617483a0912b496cdcc3ecd78b19 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Feb 2014 14:52:00 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 22e13c6..06de1cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -35,14 +35,14 @@
import java.io.OutputStream;
import java.security.MessageDigest;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.zip.Deflater;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import javax.crypto.Mac;
import org.forgerock.i18n.LocalizableMessage;
@@ -50,6 +50,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
+import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Utils;
import org.opends.server.admin.Configuration;
import org.opends.server.api.AlertGenerator;
@@ -1590,7 +1591,7 @@
// accordingly. Also get the filter since we will need it in all cases.
SearchScope scope = searchOperation.getScope();
SearchFilter filter = searchOperation.getFilter();
- switch (scope)
+ switch (scope.asEnum())
{
case BASE_OBJECT:
// We are only interested in the base entry itself. See if it matches
--
Gitblit v1.10.0