From 2e46965a521c0d294e1ab2d16fcf0fc9a60020d2 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 11 Mar 2008 11:44:07 +0000
Subject: [PATCH] Fix for issue 3049 (./uninstall --cli -a --no-prompt exit status 0 (success) despite errors reported)
---
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 2972363..f0d94c4 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1048,9 +1048,11 @@
* @return <CODE>true</CODE> if we could connect
* to the remote servers and all the presented certificates were accepted and
* <CODE>false</CODE> otherwise.
+ * @throws UserDataException if were are not in interactive mode and not in
+ * force on error mode and the operation must be stopped.
*/
private boolean updateUserUninstallDataWithRemoteServers(
- UninstallUserData userData)
+ UninstallUserData userData) throws UserDataException
{
boolean accepted = false;
boolean interactive = parser.isInteractive();
@@ -1166,7 +1168,7 @@
}
else
{
- println(
+ throw new UserDataException(null,
ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
ToolConstants.OPTION_LONG_BINDPWD,
@@ -1200,9 +1202,11 @@
* Returns <CODE>true</CODE> if the user accepts all the problems encountered
* and <CODE>false</CODE> otherwise.
* @param userData the user data.
+ * @throws UserDataException if there is an error with the information
+ * provided by the user when we are in non-interactive mode.
*/
private boolean handleTopologyCache(TopologyCache cache,
- UninstallUserData userData)
+ UninstallUserData userData) throws UserDataException
{
boolean returnValue;
boolean stopProcessing = false;
--
Gitblit v1.10.0