[jboss-svn-commits] JBL Code SVN: r18620 - in labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools: reteoo and 1 other directory.

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

Author: tirelli
Date: 2008-02-28 14:11:19 -0500 (Thu, 28 Feb 2008)
New Revision: 18620

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
Log:
JBRULES-1489: fixing NPE

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-02-28 17:40:50 UTC (rev 18619)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-02-28 19:11:19 UTC (rev 18620)
@@ -741,6 +741,7 @@
             ExecutorService executor = ExecutorServiceFactory.createExecutorService(  this.config.getExecutorService() );;
 
             executor.setCommandExecutor( new CommandExecutor( session ) );
+            ((InternalWorkingMemory) session).setExecutorService( executor );
 
             if ( keepReference ) {
                 addStatefulSession( session );

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2008-02-28 17:40:50 UTC (rev 18619)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2008-02-28 19:11:19 UTC (rev 18620)
@@ -45,6 +45,7 @@
 import org.drools.RuleBaseConfiguration.LogicalOverride;
 import org.drools.base.MapGlobalResolver;
 import org.drools.base.ShadowProxy;
+import org.drools.concurrent.ExecutorService;
 import org.drools.event.AgendaEventListener;
 import org.drools.event.AgendaEventSupport;
 import org.drools.event.RuleBaseEventListener;
@@ -86,6 +87,9 @@
     InternalWorkingMemoryActions,
     EventSupport,
     PropertyChangeListener {
+    
+    private static final long serialVersionUID = 405L;
+    
     // ------------------------------------------------------------
     // Constants
     // ------------------------------------------------------------
@@ -1479,4 +1483,11 @@
         return result;
     }
 
+    public ExecutorService getExecutorService() {
+        return null; // no executor service
+    }
+
+    public void setExecutorService(ExecutorService executor) {
+        // no executor service, so nothing to set
+    }
 }

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java	2008-02-28 17:40:50 UTC (rev 18619)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java	2008-02-28 19:11:19 UTC (rev 18620)
@@ -3,6 +3,7 @@
 import org.drools.FactException;
 import org.drools.FactHandle;
 import org.drools.WorkingMemory;
+import org.drools.concurrent.ExecutorService;
 import org.drools.event.AgendaEventSupport;
 import org.drools.event.RuleFlowEventSupport;
 import org.drools.event.WorkingMemoryEventSupport;
@@ -73,4 +74,7 @@
     
     public void addLIANodePropagation(LIANodePropagation liaNodePropagation);
     
+    public ExecutorService getExecutorService();
+
+    public void setExecutorService(ExecutorService executor);
 }

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java	2008-02-28 17:40:50 UTC (rev 18619)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java	2008-02-28 19:11:19 UTC (rev 18620)
@@ -102,4 +102,12 @@
         return this.ruleBaseListeners;
     }
 
+    public ExecutorService getExecutorService() {
+        return executor;
+    }
+
+    public void setExecutorService(ExecutorService executor) {
+        this.executor = executor;
+    }
+
 }