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

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

Author: KrisVerlaenen
Date: 2009-03-24 13:26:23 -0400 (Tue, 24 Mar 2009)
New Revision: 25801

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
Log:
 - fixed test where process was added to wrong package

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2009-03-24 16:54:42 UTC (rev 25800)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2009-03-24 17:26:23 UTC (rev 25801)
@@ -115,19 +115,21 @@
                 e.printStackTrace( System.err );
             }
             
-            if (packageBuilder.getPackage() != null) {
+            PackageRegistry pkgRegistry = this.packageBuilder.getPackageRegistry(process.getPackageName());
+            org.drools.rule.Package p = pkgRegistry.getPackage();
             
+            if (p != null) {
+            
 	            ProcessDescr processDescr = new ProcessDescr();
 	            processDescr.setName(process.getPackageName());
 	            processDescr.setResource( resource );
-	            PackageRegistry pkgRegistry = this.packageBuilder.getPackageRegistry( this.packageBuilder.getPackage().getName() );
 	            DialectCompiletimeRegistry dialectRegistry = pkgRegistry.getDialectCompiletimeRegistry();           
 	            Dialect dialect = dialectRegistry.getDialect( "java" );
 	            dialect.init(processDescr);
 	
 	            ProcessBuildContext buildContext = new ProcessBuildContext(
 	        		this.packageBuilder,
-	                this.packageBuilder.getPackage(),
+	                p,
 	                process,
 	                processDescr,
 	                dialectRegistry,
@@ -137,7 +139,7 @@
 	            if (process instanceof WorkflowProcess) {
 	            	buildNodes( (WorkflowProcess) process, buildContext );
 	            }
-	            this.packageBuilder.getPackage().addProcess( process );
+	            p.addProcess( process );
 	
 	            pkgRegistry.compileAll();                
 	            pkgRegistry.getDialectRuntimeRegistry().onBeforeExecute();