From 35e15aad5fba8ec9a3a4a6b2a5c2fa940a3be689 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Jan 2008 12:09:34 +0000
Subject: [PATCH] Fix for 2799: revert upgrade: NullPointerException in interactive mode

---
 opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
index 3169da2..28b7d8e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
@@ -80,13 +80,13 @@
     // Parse the arguments
     try
     {
+      ProgressMessageFormatter formatter =
+        new PlainTextProgressMessageFormatter();
+      cliApp.setProgressMessageFormatter(formatter);
       userData = cliApp.createUserData(launcher);
       if (userData != null)
       {
-        ProgressMessageFormatter formatter =
-                new PlainTextProgressMessageFormatter();
         cliApp.setUserData(userData);
-        cliApp.setProgressMessageFormatter(formatter);
         if (!userData.isQuiet()) {
           cliApp.addProgressUpdateListener(
                   new ProgressUpdateListener() {
@@ -123,8 +123,8 @@
           }
         }
       }
-    else
-    {
+      else
+      {
         // User cancelled operation.
         returnValue = ReturnCode.CANCELLED;
       }

--
Gitblit v1.10.0