leosimons 2003/08/23 04:14:55
Modified: scheduler-impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
Log:
slightly reorder code to make life easier on Stefan.
Patch submitted by Stefan Seifert, <[EMAIL PROTECTED]>.
Revision Changes Path
1.5 +8 -5
avalon-components/scheduler-impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file:
/home/cvs/avalon-components/scheduler-impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTimeScheduler.java 23 Aug 2003 09:46:56 -0000 1.4
+++ DefaultTimeScheduler.java 23 Aug 2003 11:14:55 -0000 1.5
@@ -206,8 +206,8 @@
if( duration < 0 )
{
- runEntry( entry );
- rescheduleEntry( entry, false );
+ // runs and reschedules the entry
+ runEntry( entry );
continue;
}
else if( 0 == duration )
@@ -423,7 +423,7 @@
}
/**
- * Rune entry in a separate thread.
+ * Run entry in a separate thread and reschedule it.
*
* @param entry the entry to run
*/
@@ -434,10 +434,10 @@
public void run()
{
doRunEntry( entry );
- // Stefan Scheifert:
+ // Stefan Seifert:
// rescheduleEntry( entry, false );
//
- // and then don't reschedule in the main run()
+ // and then don't reschedule at the end of runEntry
// this will ensure long-running events are
// queued
//
@@ -456,6 +456,9 @@
final String message = "Error executing trigger " + entry.getName();
getLogger().warn( message, e );
}
+
+ // reschedule entry
+ rescheduleEntry( entry, false );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
