From 07c3b5de55282058c5a6353f9231803f37b769e8 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Thu, 21 Feb 2002 09:37:52 +0000
Subject: [PATCH] ContextException - lets kill you!

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271479 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/myrmidon/framework/Condition.java  | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
index 9b7863226..189d2e9c4 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
@@ -8,7 +8,6 @@
 package org.apache.myrmidon.framework;
 
 import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.context.ContextException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 
@@ -45,35 +44,16 @@ public class Condition
     {
         boolean result = false;
 
-        try
+        final Object resolved = context.resolveValue( getCondition() );
+        if( null != resolved )
         {
-            final Object resolved = context.resolveValue( getCondition() );
-            if( null != resolved )
+            final Object object = context.getProperty( resolved.toString() );
+            if( object != null && !object.toString().equals( "false" ) )
             {
-                final Object object = context.get( resolved );
-                final String string = object.toString();
-                if( null == string || string.equals( "false" ) )
-                {
-                    result = false;
-                }
-                else
-                {
-                    result = true;
-                }
+                result = true;
             }
         }
-        catch( final ContextException ce )
-        {
-            // Unknown property
-            result = false;
-        }
-        /*
-                catch( final PropertyException pe )
-                {
-                    final String message = REZ.getString( "condition.no-resolve.error", m_condition );
-                    throw new ContextException( message, pe );
-                }
-        */
+
         if( !m_isIfCondition )
         {
             result = !result;