From 85811b64468e9b7a876bd352a0299b904a53a3fb Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:16:23 +0000
Subject: [PATCH] Fix for Issue #615. Add support for multiple object-class inheritance. Support added in the schema, core server and tools including Control-Panel
---
opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 26282cb..5766b3e 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -139,7 +139,7 @@
boolean isInteractive;
boolean isQuiet;
boolean isVerbose;
- boolean isCancelled = false;
+ boolean isCanceled = false;
/* Step 1: analyze the arguments.
*/
@@ -222,7 +222,7 @@
}
else
{
- isCancelled = askWhatToDelete(userData, outsideDbs, outsideLogs);
+ isCanceled = askWhatToDelete(userData, outsideDbs, outsideLogs);
}
}
String adminUid = args.getAdministratorUID();
@@ -275,12 +275,12 @@
* Step 4: check if server is running. Depending if it is running and the
* OS we are running, ask for authentication information.
*/
- if (!isCancelled)
+ if (!isCanceled)
{
- isCancelled = checkServerState(userData);
+ isCanceled = checkServerState(userData);
}
- if (isCancelled && !userData.isForceOnError())
+ if (isCanceled && !userData.isForceOnError())
{
LOG.log(Level.INFO, "User cancelled uninstall.");
userData = null;
--
Gitblit v1.10.0