[jboss-svn-commits] JBL Code SVN: r18298 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/reteoo/builder and 1 other directory.

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

Author: tirelli
Date: 2008-02-04 07:44:29 -0500 (Mon, 04 Feb 2008)
New Revision: 18298

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
Log:
JBRULES-1329: fixing node sharing count for OTN

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java	2008-02-04 11:45:08 UTC (rev 18297)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java	2008-02-04 12:44:29 UTC (rev 18298)
@@ -20,8 +20,6 @@
 import org.drools.Cheese;
 import org.drools.FactA;
 import org.drools.FactB;
-import org.drools.Order;
-import org.drools.OrderItem;
 import org.drools.Person;
 import org.drools.PersonInterface;
 import org.drools.Precondition;
@@ -326,7 +324,7 @@
                       list.get( 2 ) );
     }
 
-    public void FIXME_testRemovePackage() throws Exception {
+    public void testRemovePackage() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_RemovePackage.drl" ) ) );
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java	2008-02-04 11:45:08 UTC (rev 18297)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java	2008-02-04 12:44:29 UTC (rev 18298)
@@ -94,6 +94,7 @@
             EntryPointNode epn = context.getRuleBase().getRete().getEntryPointNode( ((EntryPointNode)candidate).getEntryPoint() );
             if( epn != null ) {
                 node = epn;
+                node.addShare();
             }
         } else if( candidate instanceof ObjectTypeNode ) {
             // object type nodes are always shared
@@ -103,6 +104,7 @@
                 otn = map.get( otn.getObjectType() );
                 if ( otn != null ) {
                     node = otn;
+                    node.addShare();
                 }
             }
         } else if( isSharingEnabledForNode( context, candidate ) ) {