From 7a6f3dd0c046db02a9cebddd7e635c2189e378ff Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 21 Jul 2012 20:43:37 +0000
Subject: [PATCH] Fix OPENDJ-522: Add capability to force the upgrade to complete if errors occur during non-interactive mode
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
index c4b57d2..604660d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.quicksetup.upgrader;
@@ -354,7 +355,7 @@
remainingChanges.removeAll(appliedChanges);
if ((firstException != null) && (appliedChanges.size() == 0))
{
- if (ui != null) {
+ if (ui.isInteractive()) {
Message cancel = INFO_CANCEL_BUTTON_LABEL.get();
Message cont = INFO_CONTINUE_BUTTON_LABEL.get();
Message retry = INFO_RETRY_BUTTON_LABEL.get();
@@ -377,6 +378,9 @@
ReturnCode.CANCELED,
INFO_UPGRADE_CANCELED.get(), firstException);
}
+ } else if (ui.isForceOnError()) {
+ // Continue.
+ remainingChanges.remove(0);
} else {
throw firstException;
}
--
Gitblit v1.10.0