[jboss-svn-commits] JBL Code SVN: r32110 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler.

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

Author: KrisVerlaenen
Date: 2010-03-16 11:16:27 -0400 (Tue, 16 Mar 2010)
New Revision: 32110

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
Log:
JBRULES-2454: BRL parsing fails if no DSL defined
 - only run generated drl through expander if no DSL

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2010-03-16 13:57:08 UTC (rev 32109)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2010-03-16 15:16:27 UTC (rev 32110)
@@ -341,6 +341,9 @@
         DefaultExpander expander = getDslExpander();
 
         try {
+        	if (expander == null) {
+        		expander = new DefaultExpander();
+        	}
             String str = expander.expand( resource.getReader() );
             if ( expander.hasErrors() ) {
                 this.results.addAll( expander.getErrors() );
@@ -368,10 +371,15 @@
         DefaultExpander expander = getDslExpander();
 
         try {
-            String str = expander.expand( new StringReader( drl ) );
-            if ( expander.hasErrors() ) {
-                this.results.addAll( expander.getErrors() );
-            }
+        	String str;
+        	if (expander != null) {
+        		str = expander.expand( new StringReader( drl ) );
+                if ( expander.hasErrors() ) {
+                    this.results.addAll( expander.getErrors() );
+                }
+        	} else {
+        		str = drl;
+        	}
 
             final PackageDescr pkg = parser.parse( str );
             this.results.addAll( parser.getErrors() );
@@ -1233,7 +1241,7 @@
     public DefaultExpander getDslExpander() {
         DefaultExpander expander = new DefaultExpander();
         if ( this.dslFiles == null || this.dslFiles.isEmpty() ) {
-            return expander;
+            return null;
         }
         for ( DSLMappingFile file : this.dslFiles ) {
             expander.addDSLMapping( file.getMapping() );