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/Application.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index baa273c..375e9f0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -666,12 +667,7 @@
*/
public UserInteraction userInteraction() {
// Note: overridden in GuiApplication
- UserInteraction ui = null;
- UserData ud = getUserData();
- if (ud != null && ud.isInteractive()) {
- ui = new CliUserInteraction();
- }
- return ui;
+ return new CliUserInteraction(getUserData());
}
/**
@@ -735,8 +731,6 @@
* @param status of the operation
* @param note string with additional information
* @throws ApplicationException if something goes wrong
- * @see {@link #writeInitialHistoricalRecord(BuildInformation,
- BuildInformation)}
*/
protected void writeHistoricalRecord(
Long id,
--
Gitblit v1.10.0