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

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

Author: tirelli
Date: 2008-08-11 18:42:58 -0400 (Mon, 11 Aug 2008)
New Revision: 21447

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
Log:
Fixing NPE

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java	2008-08-11 22:25:05 UTC (rev 21446)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java	2008-08-11 22:42:58 UTC (rev 21447)
@@ -16,9 +16,6 @@
 
 package org.drools.reteoo.builder;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.drools.InitialFact;
 import org.drools.RuleIntegrationException;
 import org.drools.base.ClassObjectType;
@@ -28,18 +25,11 @@
 import org.drools.reteoo.ReteooBuilder;
 import org.drools.reteoo.RuleTerminalNode;
 import org.drools.reteoo.TerminalNode;
-import org.drools.rule.Accumulate;
-import org.drools.rule.Collect;
-import org.drools.rule.EntryPoint;
-import org.drools.rule.EvalCondition;
-import org.drools.rule.Forall;
-import org.drools.rule.From;
-import org.drools.rule.GroupElement;
-import org.drools.rule.InvalidPatternException;
-import org.drools.rule.Pattern;
-import org.drools.rule.Query;
-import org.drools.rule.Rule;
+import org.drools.rule.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author etirelli
  *
@@ -189,19 +179,21 @@
      * @param context
      */
     private void assignPartitionId(BuildContext context) {
-        org.drools.common.RuleBasePartitionId partitionId = null;
-        if( context.getPartitionId() != null ) {
-            // it means it shares nodes with an existing partition, so
-            // assign the first id to the newly added nodes
-            partitionId = context.getPartitionId();
-        } else {
-            // nodes are independent of existing nodes, so create a new
-            // partition ID for them
-            partitionId = context.getRuleBase().createNewPartitionId();
+        if( context.getRuleBase().getConfiguration().isPartitionsEnabled() ) {
+            org.drools.common.RuleBasePartitionId partitionId = null;
+            if( context.getPartitionId() != null ) {
+                // it means it shares nodes with an existing partition, so
+                // assign the first id to the newly added nodes
+                partitionId = context.getPartitionId();
+            } else {
+                // nodes are independent of existing nodes, so create a new
+                // partition ID for them
+                partitionId = context.getRuleBase().createNewPartitionId();
+            }
+            for( BaseNode node : context.getNodes() ) {
+                node.setPartitionId( partitionId );
+            }
         }
-        for( BaseNode node : context.getNodes() ) {
-            node.setPartitionId( partitionId );
-        }
     }
 
     /**