From a22a0748441fcfaa89541eed70f4c0502bdf7b0f Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 27 Mar 2014 09:30:48 +0000
Subject: [PATCH] Fixed minor bug when uninstall is in cli mode.

---
 opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 250114f..ace5bc2 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1349,7 +1349,6 @@
     boolean returnValue;
     boolean stopProcessing = false;
     boolean reloadTopologyCache = false;
-    boolean interactive = parser.isInteractive();
 
     logger.info(LocalizableMessage.raw("Handle topology cache."));
 
@@ -1390,7 +1389,7 @@
         if (e.getCause() != null &&
             Utils.isCertificateException(e.getCause()))
         {
-          if (interactive)
+          if (isInteractive())
           {
             println();
             stopProcessing = true;
@@ -1417,7 +1416,7 @@
         exceptionMsgs.add(Utils.getMessage(e));
       }
     }
-    if (interactive)
+    if (isInteractive())
     {
       if (!stopProcessing && exceptionMsgs.size() > 0)
       {
@@ -1490,14 +1489,11 @@
   /** {@inheritDoc} */
   @Override
   public boolean isInteractive() {
-    if (!forceNonInteractive)
+    if (forceNonInteractive)
     {
       return false;
     }
-    else
-    {
-      return parser.isInteractive();
-    }
+    return parser.isInteractive();
   }
 
 

--
Gitblit v1.10.0