From 9fcace6e3a391dda5a49f6fd06a6eb6ec0bbaba8 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Fri, 25 Jan 2002 11:26:09 +0000
Subject: [PATCH] Condition no longer throws a ContextException

Submitted By: "Adam Murdoch" <adammurdoch_ml@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270850 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/java/org/apache/antlib/core/Fail.java | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
index 0200dfad6..5e9255f3e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
@@ -7,7 +7,6 @@
  */
 package org.apache.antlib.core;
 
-import org.apache.avalon.framework.context.ContextException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
@@ -53,31 +52,24 @@ public class Fail
     public void execute()
         throws TaskException
     {
-        try
+        boolean failed = true;
+
+        if( null != m_condition )
         {
-            boolean failed = true;
+            failed = m_condition.evaluate( getContext() );
+        }
 
-            if( null != m_condition )
+        if( failed )
+        {
+            if( null != m_message )
             {
-                failed = m_condition.evaluate( getContext() );
+                throw new TaskException( m_message );
             }
-
-            if( failed )
+            else
             {
-                if( null != m_message )
-                {
-                    throw new TaskException( m_message );
-                }
-                else
-                {
-                    throw new TaskException();
-                }
+                throw new TaskException();
             }
         }
-        catch( final ContextException ce )
-        {
-            throw new TaskException( ce.toString(), ce );
-        }
     }
 
     private void checkNullMessage()