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

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

Author: mark.proctor at jboss.com
Date: 2009-11-15 21:39:38 -0500 (Sun, 15 Nov 2009)
New Revision: 30165

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/ConsequenceException.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java
Log:
JBRULES-2341 Build Error Across EntryPoints And Froms
-patterns created using 'from' do not register a objecttypeconf

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/ConsequenceException.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/ConsequenceException.java	2009-11-16 01:12:20 UTC (rev 30164)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/ConsequenceException.java	2009-11-16 02:39:38 UTC (rev 30165)
@@ -7,7 +7,7 @@
 
     public ConsequenceException(final Throwable rootCause,
                                 final Rule rule) {
-        super( rootCause );
+        super( "rule: " + rule.getName() + "\n", rootCause );
         this.rule = rule;
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java	2009-11-16 01:12:20 UTC (rev 30164)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java	2009-11-16 02:39:38 UTC (rev 30165)
@@ -128,8 +128,7 @@
             final Object object = it.next();
 
             final InternalFactHandle handle = workingMemory.getFactHandleFactory().newFactHandle( object,
-                                                                                                  workingMemory.getObjectTypeConfigurationRegistry().getObjectTypeConf( context.getEntryPoint(),
-                                                                                                                                                                        object ),
+                                                                                                  null, // set this to null, otherwise it uses the driver fact's entrypoint
                                                                                                   workingMemory );
 
             RightTuple rightTuple = new RightTuple( handle,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java	2009-11-16 01:12:20 UTC (rev 30164)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java	2009-11-16 02:39:38 UTC (rev 30165)
@@ -340,6 +340,7 @@
      */
     public boolean requiresLeftActivation(final BuildUtils utils,
                                           final RuleConditionElement rce) {
-        return ((Pattern) rce).getSource() != null;
+        PatternSource source = ((Pattern) rce).getSource();
+        return  source != null && !(source instanceof EntryPoint);
     }
 }