[jboss-svn-commits] JBL Code SVN: r14561 - 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-08-25 23:08:28 -0400 (Sat, 25 Aug 2007)
New Revision: 14561

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
Log:
JBRULES-1127 External vars do not appear if you hve a break point on the first line
-the MVELFactory can now chose to not lazily create the resolvers

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-08-26 00:18:55 UTC (rev 14560)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-08-26 03:08:28 UTC (rev 14561)
@@ -60,11 +60,8 @@
 
         try {
             MVELDialect dialect = (MVELDialect) context.getDialect();
-            final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
-                                                                     null,
-                                                                     context.getPkg().getGlobals() );
-            factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );
 
+
             String text = processMacros( (String) context.getRuleDescr().getConsequence() );
 
             Dialect.AnalysisResult analysis = dialect.analyzeBlock( context,
@@ -77,10 +74,15 @@
                                                        analysis,
                                                        dialect.getInterceptors(),
                                                        null,
-                                                       context );
+                                                       context );            
+            
+            final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
+                                                                     null,
+                                                                     context.getPkg().getGlobals(),
+                                                                     analysis.getBoundIdentifiers() );
+            
+            factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );            
 
-            String s = org.mvel.debug.DebugTools.decompile(expr);
-
             context.getRule().setConsequence( new MVELConsequence( expr,
                                                                    factory ) );
         } catch ( final Exception e ) {