[jboss-svn-commits] JBL Code SVN: r15180 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2007-09-17 19:48:42 -0400 (Mon, 17 Sep 2007)
New Revision: 15180

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
Log:
Updates to fix ordering problem in audit view

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-09-17 22:38:18 UTC (rev 15179)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-09-17 23:48:42 UTC (rev 15180)
@@ -887,14 +887,14 @@
                   object,
                   propagationContext );
 
+        if ( !this.actionQueue.isEmpty() ) {
+            executeQueuedActions();
+        }
+
         this.workingMemoryEventSupport.fireObjectInserted( propagationContext,
                                                            handle,
                                                            object,
                                                            this );
-
-        if ( !this.actionQueue.isEmpty() ) {
-            executeQueuedActions();
-        }
     }
 
     protected void addPropertyChangeListener(final Object object) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java	2007-09-17 22:38:18 UTC (rev 15179)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java	2007-09-17 23:48:42 UTC (rev 15180)
@@ -209,11 +209,6 @@
             if ( this.ruleFlowGroup.isEmpty() ) {
                 // deactivate ruleflow group
                 this.ruleFlowGroup.setActive( false );
-                // only trigger next node if this RuleFlowGroup was
-                // triggered from inside a process instance
-                if ( this.ruleFlowGroup.getProcessInstance() != null ) {
-                    this.ruleFlowGroup.triggerCompleted();
-                }
             }
         }
     }