[jboss-svn-commits] JBL Code SVN: r18231 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: spi and 1 other directory.

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

Author: tirelli
Date: 2008-01-31 18:22:14 -0500 (Thu, 31 Jan 2008)
New Revision: 18231

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Action.java
Log:
JBRULES-1392: fixing build

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java	2008-01-31 22:22:32 UTC (rev 18230)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java	2008-01-31 23:22:14 UTC (rev 18231)
@@ -22,22 +22,20 @@
         this.expr = expr;
         this.prototype = factory;
     }
-    
+
     public String getDialect() {
         return "mvel";
     }
 
-    public Object createContext() {
-        return this.prototype.clone();
-    }
-    
-    public void execute(final WorkingMemory workingMemory, final Object actionContext ) throws Exception {
-        DroolsMVELFactory factory = (DroolsMVELFactory) actionContext;
+    public void execute(final WorkingMemory workingMemory) throws Exception {
+        // must clone to avoid concurrency problems
+        DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
+
         factory.setContext( null,
-                                 null,
-                                 null,
-                                 workingMemory,
-                                 null );
+                            null,
+                            null,
+                            workingMemory,
+                            null );
         CompiledExpression compexpr = (CompiledExpression) this.expr;
 
         //Receive breakpoints from debugger

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Action.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Action.java	2008-01-31 22:22:32 UTC (rev 18230)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Action.java	2008-01-31 23:22:14 UTC (rev 18231)
@@ -4,7 +4,5 @@
 
 public interface Action {
     
-    public Object createContext();
-    
-    public void execute(final WorkingMemory workingMemory, final Object actionContext ) throws Exception ;
+    public void execute(final WorkingMemory workingMemory) throws Exception ;
 }