From 1523cc3a681e295fbbfa6c7043b70b00f535fb74 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Jun 2016 08:48:34 +0000
Subject: [PATCH] OPENDJ-3143 Ensure the concatenated schema file exists before trying to upgrade it
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index e0707b5..a04d8cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -1405,9 +1405,21 @@
{
return new AbstractUpgradeTask()
{
+ private boolean shouldRunTask;
+
+ @Override
+ public void prepare(UpgradeContext context) throws ClientException
+ {
+ shouldRunTask = concatenatedSchemaFile.exists();
+ }
+
@Override
public void perform(UpgradeContext context) throws ClientException
{
+ if (!shouldRunTask)
+ {
+ return;
+ }
final ProgressNotificationCallback pnc = new ProgressNotificationCallback(INFORMATION, getSummary(), 0);
final File configFile = new File(configSchemaDirectory, "02-config.ldif");
--
Gitblit v1.10.0