From e75584b1354e33c7c373ea13521d29bb5ac433d7 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 26 Mar 2008 17:23:37 +0000
Subject: [PATCH] Fix for issues 3086 and 3087 (Command uninstall --cli should not uninstall when the user have not answer "yes")
---
opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index b16b533..7395140 100644
--- a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -685,8 +685,7 @@
}
nTries++;
}
- throw new CLIException(ERR_CONFIRMATION_TRIES_LIMIT_REACHED.get(
- maxTries));
+ throw new CLIException(ERR_TRIES_LIMIT_REACHED.get(maxTries));
}
/**
@@ -726,9 +725,10 @@
}
catch (CLIException ce)
{
- if (ce.getMessageObject().equals(
- ERR_CONFIRMATION_TRIES_LIMIT_REACHED.get(
- CONFIRMATION_MAX_TRIES)))
+ if (ce.getMessageObject().getDescriptor().equals(
+ ERR_CONFIRMATION_TRIES_LIMIT_REACHED) ||
+ ce.getMessageObject().getDescriptor().equals(
+ ERR_TRIES_LIMIT_REACHED))
{
throw ce;
}
--
Gitblit v1.10.0