From ec81970c2c2061e073a6c4083c94875ebf4cc082 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 06 Dec 2013 15:15:39 +0000
Subject: [PATCH] CR-2675 OPENDJ-1241 Server does not start after upgrade - Part II - fixed upgrade (removed white spaces in upgrade tasks, added Filter instead of LDAPFilter, added matcher and setting schema default matching rule/syntax.)
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index 6d3b8ce..f225cae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -47,9 +47,9 @@
import javax.security.auth.callback.ConfirmationCallback;
import javax.security.auth.callback.TextOutputCallback;
+import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException;
import org.opends.messages.Message;
-import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.tools.ClientException;
import org.opends.server.tools.RebuildIndex;
import org.opends.server.util.BuildVersion;
@@ -907,8 +907,8 @@
Installation.CURRENT_CONFIG_FILE_NAME);
final int changeCount =
- updateConfigFile(configFile.getPath(), LDAPFilter
- .decode(filter), ChangeOperationType.MODIFY, ldif);
+ updateConfigFile(configFile.getPath(), Filter.valueOf(filter),
+ ChangeOperationType.MODIFY, ldif);
displayChangeCount(configFile.getPath(), changeCount);
--
Gitblit v1.10.0