[jboss-svn-commits] JBL Code SVN: r23961 - 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-19 07:34:24 -0500 (Wed, 19 Nov 2008)
New Revision: 23961

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-19 12:22:56 UTC (rev 23960)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-11-19 12:34:24 UTC (rev 23961)
@@ -635,7 +635,12 @@
             inputTypes[i++] = entry.getValue().getName();
         }
 
-        String name = context.getPkg().getName();
+        String name;
+        if ( context != null && context.getPkg() != null & context.getPkg().getName() != null ) {
+            name = context.getPkg().getName();
+        } else {
+            name = "";
+        }
         MVELCompilationUnit compilationUnit = new MVELCompilationUnit( name,
                                                                        expression,
                                                                        pkgImports,
@@ -659,9 +664,15 @@
                                           final Map otherInputVariables,
                                           final PackageBuildContext context) {
         // @todo proper source file name
+        String name;
+        if ( context != null && context.getPkg() != null & context.getPkg().getName() != null ) {
+            name = context.getPkg().getName();
+        } else {
+            name = "";
+        }
         final ParserContext parserContext = new ParserContext( this.imports,
                                                                null,
-                                                               context.getPkg().getName()+ "_" + nameCounter.getAndIncrement() );
+                                                               name + "_" + nameCounter.getAndIncrement() );
         // getRuleDescr().getClassName() );
 
         for ( Iterator it = this.packageImports.values().iterator(); it.hasNext(); ) {