donaldp 02/04/30 07:41:11
Modified: src/main/org/apache/tools/ant/taskdefs/optional/extension
JarLibResolveTask.java
Log:
If property is already set then generate a warning or an exception - dont try
to chekc if it is valid.
Revision Changes Path
1.2 +5 -9
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
Index: JarLibResolveTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarLibResolveTask.java 30 Apr 2002 14:33:55 -0000 1.1
+++ JarLibResolveTask.java 30 Apr 2002 14:41:11 -0000 1.2
@@ -164,18 +164,14 @@
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;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
