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

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

Author: michael.neale at jboss.com
Date: 2008-08-01 01:08:18 -0400 (Fri, 01 Aug 2008)
New Revision: 21319

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
Log:
to deal with null pkg Descr

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-08-01 03:29:26 UTC (rev 21318)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-08-01 05:08:18 UTC (rev 21319)
@@ -1,6 +1,7 @@
 package org.drools.guvnor.server.contenthandler;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -71,6 +72,8 @@
     	if (parser.hasErrors()) {
     		throw new DroolsParserException("The model drl " + drl + " is not valid");
     	}
+
+    	if (pkg == null) return Collections.emptyList();
     	List<TypeDeclarationDescr> types = pkg.getTypeDeclarations();
     	List<FactMetaModel> list = new ArrayList<FactMetaModel>(types.size());
     	for (TypeDeclarationDescr td : types) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java	2008-08-01 03:29:26 UTC (rev 21318)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java	2008-08-01 05:08:18 UTC (rev 21319)
@@ -82,7 +82,17 @@
     }
 
 
+    public void testFromEmptyDrl() throws Exception {
+    	String drl = "";
 
+    	FactModelContentHandler ch = new FactModelContentHandler();
+    	List<FactMetaModel> list = ch.toModel(drl);
+    	assertNotNull(list);
+
+
+    }
+
+
     public void testStore() throws Exception {
     	FactModelContentHandler ch = new FactModelContentHandler();