From 92712f7da35eb709e299bb107d90a6749c274602 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 8 Jul 2001 07:26:44 +0000 Subject: [PATCH] Update to reflect that that evaluate throws ContextException instead of TaskException. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269300 13f79535-47bb-0310-9956-ffa450edef68 --- .../components/workspace/DefaultWorkspace.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java index 3f1cf4218..0445901f7 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.Map; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; +import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -380,11 +381,19 @@ public class DefaultWorkspace final Condition condition = target.getCondition(); if( null != condition ) { - if( false == condition.evaluate( frame.getContext() ) ) + try + { + if( false == condition.evaluate( frame.getContext() ) ) + { + getLogger().debug( "Skipping target " + name + + " as it does not satisfy condition" ); + return; + } + } + catch( final ContextException ce ) { - getLogger().debug( "Skipping target " + name + - " as it does not satisfy condition" ); - return; + throw new TaskException( "Error evaluating Condition for target " + + name, ce ); } }