From 2e83705627546bbf34e6f1fe6922c51bcbf5d0a0 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 02 Dec 2013 09:34:32 +0000
Subject: [PATCH] CR-2635 Second fix for OpenDJ-1196. As an issue was find by Christophe when template 02-config was deleted, added a check on template existence before copying it. - Added i18n/path in messages. - Added message ouput for post upgrade task. - Moved temp file creation as it leaves .temp files in schema folder when upgrade fails.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 09d7875..6d3b8ce 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
@@ -151,7 +151,11 @@
try
{
context.notifyProgress(pnc.setProgress(20));
-
+ if (!schemaFileTemplate.exists() || schemaFileTemplate.length() == 0)
+ {
+ throw new IOException(ERR_UPGRADE_CORRUPTED_TEMPLATE
+ .get(schemaFileTemplate.getPath()).toString());
+ }
copy(schemaFileTemplate, configSchemaDirectory, true);
context.notifyProgress(pnc.setProgress(100));
}
@@ -487,9 +491,8 @@
// Requires answer from the user.
final int answer = context.confirmYN(summary, ConfirmationCallback.NO);
isATaskToPerform = (answer == ConfirmationCallback.YES);
- isRebuildAllIndexesIsPresent = true;
- isRebuildAllIndexesTaskAccepted = isATaskToPerform;
-
+ isRebuildAllIndexesIsPresent = true;
+ isRebuildAllIndexesTaskAccepted = isATaskToPerform;
}
@Override
@@ -650,9 +653,9 @@
}
else
{
- LOG.log(Level.SEVERE, ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL.get()
- .toString());
+ final Message msg = ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL.get();
context.notifyProgress(pnc.setProgress(-100));
+ throw new ClientException(EXIT_CODE_ERROR, msg);
}
}
};
--
Gitblit v1.10.0