From 58257e4ff6cc42fbd00bdf71cb1ecce4b1e117cc Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 30 Apr 2002 14:41:11 +0000 Subject: [PATCH] If property is already set then generate a warning or an exception - dont try to chekc if it is valid. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272625 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/extension/JarLibResolveTask.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java index ea5635cb8..d4845da6f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java @@ -164,18 +164,14 @@ public class JarLibResolveTask if( null != candidate ) { - final File file = - getProject().resolveFile( candidate ); - getProject().log( "Property Already set to: " + file, - Project.MSG_VERBOSE ); - try + final String message = "Property Already set to: " + candidate; + if( m_failOnError ) { - checkExtension( file ); - return; + throw new BuildException( message ); } - catch( final BuildException e ) + else { - missingExtension(); + getProject().log( message, Project.MSG_ERR ); return; } }