[jboss-svn-commits] JBL Code SVN: r26947 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/builder and 1 other directory.

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

Author: Rikkola
Date: 2009-06-12 07:54:42 -0400 (Fri, 12 Jun 2009)
New Revision: 26947

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
Log:
GUVNOR-327 : NPE when building imported drl package

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-06-12 11:39:18 UTC (rev 26946)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-06-12 11:54:42 UTC (rev 26947)
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.jar.JarInputStream;
 
 import org.drools.builder.conf.DefaultPackageNameOption;
 import org.drools.compiler.DroolsError;
@@ -301,7 +300,7 @@
 	}
 
 	private void addDrl(String drl) {
-		if ("".equals(drl)) {
+		if ( "".equals( drl.trim() ) ) {
 			return;
 		}
 		try {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-06-12 11:39:18 UTC (rev 26946)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-06-12 11:54:42 UTC (rev 26947)
@@ -620,8 +620,34 @@
         assertEquals(-1, drl.indexOf("garbage"));
 
     }
+    
+    public void testBuildPackageWithEmptyHeader() throws Exception {
+        RulesRepository repo = getRepo();
 
+        //first, setup the package correctly:
+        PackageItem pkg = repo.createPackage( "testBuildPackageWithEmptyHeader",
+                                              "" );
 
+        ServiceImplementation.updateDroolsHeader( "\n",
+                                                  pkg );
+        repo.save();
+
+        ContentPackageAssembler asm = null;
+        try {
+            asm = new ContentPackageAssembler( pkg );
+        } catch ( NullPointerException e ) {
+            // Possible cause: Header has only white spaces "\n\t".
+            fail( e.toString() );
+        }
+        String drl = asm.getDRL();
+
+        assertNotNull( drl );
+        assertEquals( "package testBuildPackageWithEmptyHeader",
+                      drl.trim() );
+
+    }
+
+
     public void testSkipDisabledPackageStuff() throws Exception {
         RulesRepository repo = getRepo();