You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2009/02/15 13:07:52 UTC
svn commit: r744658 - in
/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks:
AbstractAntTask.java Dep.java ResolveTask.java WriteTask.java
Author: hboutemy
Date: Sun Feb 15 12:07:51 2009
New Revision: 744658
URL: http://svn.apache.org/viewvc?rev=744658&view=rev
Log:
improved exception handling
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java?rev=744658&r1=744657&r2=744658&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java Sun Feb 15 12:07:51 2009
@@ -52,6 +52,15 @@
}
}
+ protected void throwIfEnabled( Throwable t )
+ throws BuildException
+ {
+ if ( _failOnError )
+ {
+ throw new BuildException( t );
+ }
+ }
+
// ----------------------------------------------------------------------------------------
public static final Config findConfig( Project project, String configId )
throws Exception
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744658&r1=744657&r2=744658&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Sun Feb 15 12:07:51 2009
@@ -405,7 +405,7 @@
}
catch ( Exception e )
{
- LOG.error( e.getMessage() );
+ LOG.error( "unable to create dependencies iterator", e );
return null;
}
@@ -427,7 +427,7 @@
}
catch ( Exception e )
{
- LOG.error( e.getMessage() );
+ LOG.error( "unable to count dependencies", e );
return 0;
}
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=744658&r1=744657&r2=744658&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Sun Feb 15 12:07:51 2009
@@ -203,14 +203,7 @@
}
catch ( Exception e )
{
- if ( _failOnError )
- {
- throw new BuildException( e.getMessage() );
- }
- else
- {
- return;
- }
+ throwIfEnabled( e );
}
}
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=744658&r1=744657&r2=744658&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java Sun Feb 15 12:07:51 2009
@@ -200,7 +200,7 @@
}
catch ( Exception e )
{
- throwIfEnabled( e.getMessage() );
+ throwIfEnabled( e );
}
}