[jboss-svn-commits] JBL Code SVN: r18379 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 7 13:24:19 EST 2008
Author: mark.proctor at jboss.com
Date: 2008-02-07 13:24:19 -0500 (Thu, 07 Feb 2008)
New Revision: 18379
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
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/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/MVELReturnValueEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
Log:
JBRULES-720 Clips Parser
-MVEL should do a null check befor setting next parser to the function factory.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -24,6 +24,8 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
@@ -100,6 +102,13 @@
handle.getObject(),
workingMemory,
(Map) context );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
MVEL.executeExpression( this.action,
null,
factory );
@@ -118,6 +127,13 @@
handle.getObject(),
workingMemory,
(Map) context );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
MVEL.executeExpression( this.reverse,
null,
factory );
@@ -137,6 +153,13 @@
null,
workingMemory,
(Map) context );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
final Object result = MVEL.executeExpression( this.result,
null,
factory );
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-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -3,6 +3,8 @@
import java.io.Serializable;
import org.drools.WorkingMemory;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.Action;
import org.mvel.compiler.CompiledExpression;
import org.mvel.MVEL;
@@ -36,6 +38,13 @@
null,
workingMemory,
null );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
CompiledExpression compexpr = (CompiledExpression) this.expr;
//Receive breakpoints from debugger
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 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -5,6 +5,7 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
import org.mvel.compiler.CompiledExpression;
@@ -36,8 +37,11 @@
workingMemory,
null );
- MVELDialectData data = ( MVELDialectData ) workingMemory.getRuleBase().getPackage( "MAIN" ).getDialectDatas().getDialectData( "mvel" );
- factory.setNextFactory( data.getFunctionFactory() );
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
CompiledExpression compexpr = (CompiledExpression) this.expr;
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 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -4,6 +4,8 @@
import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.EvalExpression;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
@@ -39,6 +41,13 @@
null,
workingMemory,
null );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
new Object(),
factory );
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 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -4,6 +4,8 @@
import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.PredicateExpression;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
@@ -39,6 +41,13 @@
object,
workingMemory,
null );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
object,
factory );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -3,6 +3,8 @@
import java.io.Serializable;
import org.drools.WorkingMemory;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.ReturnValueEvaluator;
import org.mvel.compiler.CompiledExpression;
import org.mvel.MVEL;
@@ -34,6 +36,13 @@
null,
workingMemory,
null );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
+
CompiledExpression compexpr = (CompiledExpression) this.expr;
//Receive breakpoints from debugger
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 2008-02-07 15:15:56 UTC (rev 18378)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-02-07 18:24:19 UTC (rev 18379)
@@ -4,6 +4,8 @@
import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectData;
+import org.drools.rule.Package;
import org.drools.spi.FieldValue;
import org.drools.spi.ReturnValueExpression;
import org.drools.spi.Tuple;
@@ -36,6 +38,12 @@
object,
workingMemory,
null );
+
+ Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
+ if ( pkg != null ) {
+ MVELDialectData data = ( MVELDialectData ) pkg.getDialectDatas().getDialectData( "mvel" );
+ factory.setNextFactory( data.getFunctionFactory() );
+ }
return org.drools.base.FieldFactory.getFieldValue( MVEL.executeExpression( this.expr,
null,
More information about the jboss-svn-commits
mailing list