[jboss-svn-commits] JBL Code SVN: r23995 - 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: 2008-11-20 10:34:03 -0500 (Thu, 20 Nov 2008)
New Revision: 23995

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.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-20 15:23:16 UTC (rev 23994)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-11-20 15:34:03 UTC (rev 23995)
@@ -134,9 +134,7 @@
 
     private boolean                                        strictMode;
     private int                                            languageLevel;
-    public static final Object                             COMPILER_LOCK                  = new Object();
-    
-    private static AtomicInteger                           nameCounter = new AtomicInteger();
+    public static final Object                             COMPILER_LOCK                  = new Object();    
 
     public MVELDialect(PackageBuilder builder,
                        PackageRegistry pkgRegistry,
@@ -666,13 +664,17 @@
         // @todo proper source file name
         String name;
         if ( context != null && context.getPkg() != null & context.getPkg().getName() != null ) {
-            name = context.getPkg().getName();
+            if ( context instanceof RuleBuildContext ) {
+                name = context.getPkg().getName() + "." + ((RuleBuildContext)context).getRuleDescr().getClassName();
+            } else {
+                name = context.getPkg().getName() + ".Unknown";
+            }
         } else {
-            name = "";
+            name = "Unknown";
         }
         final ParserContext parserContext = new ParserContext( this.imports,
                                                                null,
-                                                               name + "_" + nameCounter.getAndIncrement() );
+                                                               name );
         // getRuleDescr().getClassName() );
 
         for ( Iterator it = this.packageImports.values().iterator(); it.hasNext(); ) {