[jboss-svn-commits] JBL Code SVN: r13318 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel.

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

Author: mark.proctor at jboss.com
Date: 2007-07-10 16:37:31 -0400 (Tue, 10 Jul 2007)
New Revision: 13318

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
Log:
-added MVEL fixes for accumulate

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2007-07-10 20:28:12 UTC (rev 13317)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2007-07-10 20:37:31 UTC (rev 13318)
@@ -113,10 +113,12 @@
                                                                                     null,
                                                                                     accumDescr.getActionCode(),
                                                                                     initCodeAnalysis.getMvelVariables() );
+            actionCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
             final MVELAnalysisResult resultCodeAnalysis = ( MVELAnalysisResult ) dialect.analyzeExpression( context,
                                                                                          accumDescr,
                                                                                          accumDescr.getResultCode(),
                                                                                          initCodeAnalysis.getMvelVariables()  );
+            resultCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
 
             final List requiredDeclarations = new ArrayList( initCodeAnalysis.getBoundIdentifiers()[0] );
             requiredDeclarations.addAll( actionCodeAnalysis.getBoundIdentifiers()[0] );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-07-10 20:28:12 UTC (rev 13317)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-07-10 20:37:31 UTC (rev 13318)
@@ -316,13 +316,16 @@
                                     (Class) globalTypes.get( identifier ) );
         }
 
-        Map localVars = ((MVELAnalysisResult)analysis).getMvelVariables();
-        for ( Iterator it = localVars.entrySet().iterator(); it.hasNext(); ) {
-            Entry entry = (Entry) it.next();
-            parserContext.addInput( (String)entry.getKey(),
-                                    (Class) entry.getValue() );
-        }        
         
+        Map mvelVars = ((MVELAnalysisResult)analysis).getMvelVariables();
+        if ( mvelVars != null ) {
+            for ( Iterator it = mvelVars.entrySet().iterator(); it.hasNext(); ) {
+                Entry entry = (Entry) it.next();
+                parserContext.addInput( (String)entry.getKey(),
+                                        (Class) entry.getValue() );
+            }        
+        }
+        
         parserContext.addInput( "drools",
                                 KnowledgeHelper.class );