From d056ebdcc008cc3f0343390c682fddd6b9946384 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 20 Jun 2013 20:16:32 +0000
Subject: [PATCH] Fix OPENDJ-992: JE environment failure (LOG_FILE_NOT_FOUND) after upgrading from OpenDJ 2.4.6 to OpenDJ 2.6.0

---
 opends/src/server/org/opends/server/tools/upgrade/Upgrade.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 3e5d3b3..02ef657 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -288,6 +288,12 @@
         "-",
         "add:ds-cfg-subject-attribute-mapping",
         "ds-cfg-subject-attribute-mapping: emailAddress:mail"));
+
+    /* See OPENDJ-992 */
+    register("2.5.0.9013",
+        regressionInVersion("2.5.0.7640",
+            rebuildSingleIndex(INFO_UPGRADE_TASK_9013_DESCRIPTION.get())));
+
     /*
      * All upgrades will refresh the server configuration schema and generate
      * a new upgrade folder.
@@ -469,12 +475,10 @@
     }
   }
 
-
-
   private static void register(final String versionString,
       final UpgradeTask... tasks)
   {
-    final BuildVersion version = version(versionString);
+    final BuildVersion version = BuildVersion.valueOf(versionString);
     List<UpgradeTask> taskList = TASKS.get(version);
     if (taskList == null)
     {
@@ -518,14 +522,6 @@
 
 
 
-  private static BuildVersion version(final String version)
-  {
-    // TODO Need to change it when change to GIT.
-    return BuildVersion.valueOf(version);
-  }
-
-
-
   /**
    * The server must be offline during the upgrade.
    *

--
Gitblit v1.10.0