From 3139679a516721b5a31c0f40458679a72d861263 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 13 Apr 2016 09:30:01 +0000
Subject: [PATCH] OPENDJ-2827 additional fixes

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 6357e4b..f815b3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -113,7 +113,7 @@
 import org.opends.server.types.SchemaFileElement;
 import org.opends.server.types.SearchFilter;
 import org.opends.server.util.BackupManager;
-import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.BuildVersion;
 import org.opends.server.util.LDIFException;
 import org.opends.server.util.LDIFReader;
 import org.opends.server.util.LDIFWriter;
@@ -352,7 +352,8 @@
       }
       else
       {
-        concatFile = new File(upgradeDirectory, SCHEMA_BASE_FILE_NAME_WITHOUT_REVISION + DynamicConstants.REVISION);
+        concatFile = new File(upgradeDirectory, SCHEMA_BASE_FILE_NAME_WITHOUT_REVISION +
+            BuildVersion.instanceVersion().getRevision());
         if (concatFile.exists())
         {
           concatFilePath = concatFile.getAbsolutePath();

--
Gitblit v1.10.0