[jboss-svn-commits] JBL Code SVN: r23875 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder.

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

Author: Rikkola
Date: 2008-11-14 09:00:15 -0500 (Fri, 14 Nov 2008)
New Revision: 23875

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
Log:
JBRULES-1841: If any global is a declared type it makes the test scenarios fail.
When running test scenarios, header was loaded before declared types. Fixed now.

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	2008-11-14 12:21:44 UTC (rev 23874)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2008-11-14 14:00:15 UTC (rev 23875)
@@ -173,9 +173,9 @@
         //firstly we loadup the classpath
         builder.addPackage( new PackageDescr( pkg.getName() ) );
 
+        loadDeclaredTypes();
         //now we deal with the header (imports, templates, globals).
         addDrl( ServiceImplementation.getDroolsHeader( pkg ) );
-        loadDeclaredTypes();
         if ( builder.hasErrors() ) {
             recordBuilderErrors( pkg );
             //if we have any failures, lets drop out now, no point in going