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

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

Author: mark.proctor at jboss.com
Date: 2008-07-17 20:41:06 -0400 (Thu, 17 Jul 2008)
New Revision: 21098

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
Log:
JBRULES-1684 Package merging is incorrect for dialects
-was not correctly adding global information to the rulebase

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-07-18 00:30:56 UTC (rev 21097)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-07-18 00:41:06 UTC (rev 21098)
@@ -501,7 +501,7 @@
         imports.putAll( newPkg.getImports() );
 
         // merge globals
-        if ( newPkg.getGlobals() != null || newPkg.getGlobals() != Collections.EMPTY_MAP ) {
+        if ( newPkg.getGlobals() != null && newPkg.getGlobals() != Collections.EMPTY_MAP ) {
             Map<String, Class> globals = pkg.getGlobals();
             // Add globals
             for ( final Map.Entry<String, Class> entry : newPkg.getGlobals().entrySet() ) {
@@ -512,6 +512,8 @@
                 } else {
                     pkg.addGlobal( identifier,
                                    type );
+                    // this isn't a package merge, it's adding to the rulebase, but I've put it here for convienience
+                    this.globals.put( identifier, type );
                 } 
             }
         }