[BZ-801093] cancel the job handle related with a canceled activation …

…+ check if the agenda has been halted
apache · Aug 31, 2012 · aed459f · aed459f
1 parent ed6b8c5
commit aed459f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/TimerAndCalendarTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/TimerAndCalendarTest.java
@@ -994,7 +994,7 @@ public boolean isTimeIncluded(long timestamp) {
         assertEquals( 3, list.size() );
     }
 
-    @Test @Ignore
+    @Test
     public void testTimerWithNot() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_Timer_With_Not.drl" ) ) );
@@ -1012,7 +1012,7 @@ public void testTimerWithNot() throws Exception {
         assertEquals( 2, workingMemory.getFactCount() );
     }
 
-    @Test @Ignore
+    @Test
     public void testHaltWithTimer() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_Halt_With_Timer.drl" ) ) );

diff --git a/drools-core/src/main/java/org/drools/common/DefaultAgenda.java b/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
@@ -596,6 +596,7 @@ public void cancelActivation(final LeftTuple leftTuple,
                                  final Activation activation,
                                  final RuleTerminalNode rtn ) {
         AgendaItem item = (AgendaItem) activation;
+        item.cancel();
         item.removeAllBlockersAndBlocked( this );               
 
         if ( isDeclarativeAgenda() && activation.getFactHandle() == null ) {
@@ -1377,6 +1378,10 @@ public void halt() {
         notifyHalt();
     }
 
+    public boolean isHalted() {
+        return halt.get();
+    }
+
     public ConsequenceExceptionHandler getConsequenceExceptionHandler() {
         return this.legacyConsequenceExceptionHandler;
     }

diff --git a/drools-core/src/main/java/org/drools/common/InternalAgenda.java b/drools-core/src/main/java/org/drools/common/InternalAgenda.java
@@ -146,6 +146,8 @@ public int fireAllRules(AgendaFilter agendaFilter,
      * execution though.
      */
     public void halt();
+
+    public boolean isHalted();
 
     public void notifyHalt();
 

diff --git a/drools-core/src/main/java/org/drools/common/Scheduler.java b/drools-core/src/main/java/org/drools/common/Scheduler.java
@@ -82,16 +82,29 @@ public static class ActivationTimerJob implements Job {
         public void execute(JobContext ctx) {
             InternalAgenda agenda = ( InternalAgenda ) ((ActivationTimerJobContext)ctx).getAgenda();
             ScheduledAgendaItem item  = ((ActivationTimerJobContext)ctx).getScheduledAgendaItem();
-
+
+            if (agenda.isHalted()) {
+                item.getJobHandle().setCancel( true );
+                return;
+            }
+
             agenda.fireActivation( item );
+
+            if ( item.isCanceled() ) {
+                item.getJobHandle().setCancel( true );
+            }
+
             if ( ((ActivationTimerJobContext)ctx).getTrigger().hasNextFireTime() == null ) {
                 agenda.getScheduledActivationsLinkedList().remove( item );
             } else {
                 // the activation has been rescheduled, the Agenda would have set it's activated to false
                 // so reset the activated to true here
                 item.setActivated( true );
             }
-            agenda.getWorkingMemory().fireAllRules();
+
+            if (!agenda.isHalted()) {
+                agenda.getWorkingMemory().fireAllRules();
+            }
         }
     }