From 00d37e85955e374be365f1c34de5af1f69a6476c Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
index 95de7fd..43c5f80 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -57,21 +57,14 @@
private final boolean isForceOnError;
/**
- * Creates an instance that will use standard streams for interaction.
- */
- public CliUserInteraction() {
- this(null);
- }
-
- /**
* Creates an instance that will use standard streams for interaction and with
* the provided CLI arguments.
* @param ud The CLI arguments.
*/
public CliUserInteraction(UserData ud) {
super(System.in, System.out, System.err);
- isInteractive = ud != null ? ud.isInteractive() : true;
- isForceOnError = ud != null ? ud.isForceOnError() : false;
+ isInteractive = ud == null || ud.isInteractive();
+ isForceOnError = ud != null && ud.isForceOnError();
}
/**
@@ -125,7 +118,7 @@
Object returnValue = null;
boolean menuDisplayed = false;
while (returnValue == null) {
- int respInt = -1;
+ int respInt;
try
{
if (menuDisplayed)
--
Gitblit v1.10.0