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

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

Author: mark.proctor at jboss.com
Date: 2007-05-22 07:56:18 -0400 (Tue, 22 May 2007)
New Revision: 12069

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
Log:
JBRULES-708 Full MVEL integration

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java	2007-05-22 11:08:57 UTC (rev 12068)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java	2007-05-22 11:56:18 UTC (rev 12069)
@@ -27,6 +27,7 @@
                                  null,
                                  workingMemory );
         MVEL.executeExpression( this.expr,
+                                new Object(),
                                 this.factory );
     }
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java	2007-05-22 11:08:57 UTC (rev 12068)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java	2007-05-22 11:56:18 UTC (rev 12069)
@@ -30,7 +30,8 @@
                             null,
                             workingMemory );
         final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
-                                                           this.factory );
+                                                                 new Object(),
+                                                                 this.factory );
         return result.booleanValue();
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2007-05-22 11:08:57 UTC (rev 12068)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2007-05-22 11:56:18 UTC (rev 12069)
@@ -31,6 +31,7 @@
                             object,
                             workingMemory );
         final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
+                                                                 new Object(),
                                                            this.factory );
         return result.booleanValue();
     }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java	2007-05-22 11:08:57 UTC (rev 12068)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java	2007-05-22 11:56:18 UTC (rev 12069)
@@ -32,6 +32,7 @@
                             object,
                             workingMemory );
         return org.drools.base.FieldFactory.getFieldValue( MVEL.executeExpression( this.expr,
+                                                                                   new Object(),
                                                                                    this.factory ) );
     }