You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by co...@apache.org on 2002/02/18 16:39:43 UTC
cvs commit: jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord CollectorTarget.java Overlord.java Resources.properties
colus 02/02/18 07:39:43
Modified: apps/overlord/src/java/org/apache/avalon/overlord
CollectorTarget.java Overlord.java
Resources.properties
Log:
Fix redundant error logging.
Revision Changes Path
1.3 +4 -4 jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/CollectorTarget.java
Index: CollectorTarget.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/CollectorTarget.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CollectorTarget.java 28 Nov 2001 07:43:42 -0000 1.2
+++ CollectorTarget.java 18 Feb 2002 15:39:42 -0000 1.3
@@ -43,14 +43,14 @@
{
m_server.collect( m_collectorName );
- final String message = REZ.getString( "target.notice.execute",
- m_taskName );
+ final String message =
+ REZ.getString( "target.notice.execute", m_taskName );
getLogger().info( message );
}
catch ( final Exception e )
{
- final String message = REZ.getString( "target.error.execute",
- m_taskName );
+ final String message =
+ REZ.getString( "target.error.execute", m_taskName );
getLogger().error( message, e );
}
}
1.7 +2 -13 jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java
Index: Overlord.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Overlord.java 23 Jan 2002 09:34:58 -0000 1.6
+++ Overlord.java 18 Feb 2002 15:39:43 -0000 1.7
@@ -187,7 +187,7 @@
*
* @param taskName the name of task to add
* @param trigger trigger
- * @param collector collector to invoke
+ * @param collectorName collector to invoke
*/
private void addTask( final String taskName, final TimeTrigger trigger,
final String collectorName )
@@ -246,18 +246,7 @@
throw new ComponentException( message );
}
- //execute
- try
- {
- collector.execute();
- }
- catch ( final Exception e )
- {
- final String message =
- REZ.getString( "overlord.error.collector.execute", name );
- getLogger().error( message, e );
- throw e;
- }
+ collector.execute();
}
private void setupComponent( final Component component,
1.4 +0 -1 jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/Resources.properties
Index: Resources.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/overlord/src/java/org/apache/avalon/overlord/Resources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Resources.properties 28 Nov 2001 07:42:36 -0000 1.3
+++ Resources.properties 18 Feb 2002 15:39:43 -0000 1.4
@@ -7,7 +7,6 @@
overlord.error.trigger.unknown=Unknown TimeTrigger class {0}.
overlord.error.collector.dispose=Error disposing task {0}.
overlord.error.collector.find=Unable to find Collector named {0}.
-overlord.error.collector.execute=Error executing Collector {0}.
overlord.error.collector.exists=Collector {0} already exists.
target.notice.execute=Task {0} executed successfully.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>