From 979efc9b01231c8dff0cbdf1743b422c365a90f5 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 02 Dec 2013 17:12:20 +0000
Subject: [PATCH] One liner fix to OPENDJ-1226 : Upgrade should only consider .ldif files under config/schema. Make sure we filter config/schema files like when reading it, considering only .ldif files.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index 810ec28..221b30b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -46,6 +46,7 @@
import org.forgerock.opendj.ldif.LDIFEntryReader;
import org.forgerock.opendj.ldif.LDIFEntryWriter;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.SchemaConfigManager;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.util.ChangeOperationType;
import org.opends.server.util.SetupUtils;
@@ -708,7 +709,9 @@
{
if (folder.isDirectory())
{
- for (final File f : folder.listFiles())
+ final FilenameFilter filter =
+ new SchemaConfigManager.SchemaFileFilter();
+ for (final File f : folder.listFiles(filter))
{
LOG.log(Level.INFO, String.format("Processing %s", f
.getAbsolutePath()));
--
Gitblit v1.10.0