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

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

Author: mark.proctor at jboss.com
Date: 2008-11-19 07:04:42 -0500 (Wed, 19 Nov 2008)
New Revision: 23958

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
Log:
-fixed MVEL parser context naming issue.

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	2008-11-19 11:48:21 UTC (rev 23957)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-11-19 12:04:42 UTC (rev 23958)
@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.drools.base.ModifyInterceptor;
 import org.drools.base.TypeResolver;
@@ -134,6 +135,8 @@
     private boolean                                        strictMode;
     private int                                            languageLevel;
     public static final Object                             COMPILER_LOCK                  = new Object();
+    
+    private static AtomicInteger                           nameCounter;
 
     public MVELDialect(PackageBuilder builder,
                        PackageRegistry pkgRegistry,
@@ -632,7 +635,9 @@
             inputTypes[i++] = entry.getValue().getName();
         }
 
-        MVELCompilationUnit compilationUnit = new MVELCompilationUnit( expression,
+        String name = context.getPkg().getName();
+        MVELCompilationUnit compilationUnit = new MVELCompilationUnit( name,
+                                                                       expression,
                                                                        pkgImports,
                                                                        importClasses.toArray( new String[importClasses.size()] ),
                                                                        importMethods.toArray( new String[importMethods.size()] ),
@@ -656,7 +661,7 @@
         // @todo proper source file name
         final ParserContext parserContext = new ParserContext( this.imports,
                                                                null,
-                                                               "xxx" );// context.getPkg().getName()+"."+context.
+                                                               context.getPkg().getName()+ "_" + nameCounter.getAndIncrement() );
         // getRuleDescr().getClassName() );
 
         for ( Iterator it = this.packageImports.values().iterator(); it.hasNext(); ) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java	2008-11-19 11:48:21 UTC (rev 23957)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java	2008-11-19 12:04:42 UTC (rev 23958)
@@ -13,6 +13,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.drools.RuntimeDroolsException;
 import org.drools.base.ModifyInterceptor;
@@ -26,6 +27,9 @@
 public class MVELCompilationUnit
     implements
     Externalizable {
+    private String                          name;
+    private static AtomicInteger            nameCounter;
+    
     private String                          expression;
 
     private String[]                        pkgImports;
@@ -84,10 +88,8 @@
 
     public static final Object              COMPILER_LOCK = new Object();
 
-    public MVELCompilationUnit() {
-    }
-
-    public MVELCompilationUnit(String expression,
+    public MVELCompilationUnit(String name, 
+                               String expression,
                                String[] pkgImports,
                                String[] importClasses,
                                String[] importMethods,
@@ -226,7 +228,7 @@
 
         final ParserContext parserContext = new ParserContext( resolvedImports,
                                                                null,
-                                                               "xxx" );// context.getPkg().getName()+"."+context.
+                                                               name + "_" + this.nameCounter.getAndIncrement() );
         parserContext.getParserConfiguration().setClassLoader( classLoader );
 
         for ( String pkgImport : this.pkgImports ) {