[jboss-svn-commits] JBL Code SVN: r7062 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: common reteoo util

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

Author: mark.proctor at jboss.com
Date: 2006-10-23 22:33:30 -0400 (Mon, 23 Oct 2006)
New Revision: 7062

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java
Log:
-Fixed LLR. ReteTuple.get(Declaration) was using  getIndex instead of getFactIndex()

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2006-10-24 02:33:24 UTC (rev 7061)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2006-10-24 02:33:30 UTC (rev 7062)
@@ -440,7 +440,7 @@
             activation.getRule().getConsequence().evaluate( this.knowledgeHelper,
                                                             this.workingMemory );
         } catch ( final Exception e ) {
-            //e.printStackTrace();
+            e.printStackTrace();
             throw new ConsequenceException( e,
                                             activation.getRule() );
         }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java	2006-10-24 02:33:24 UTC (rev 7061)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java	2006-10-24 02:33:30 UTC (rev 7062)
@@ -52,6 +52,7 @@
 
     public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints) {
         this( constraints, true );
+        this.indexed = -1;
     }
 
     public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints, boolean index ) {
@@ -62,7 +63,7 @@
         for ( int i = 0, length = constraints.length; i < length; i++ ) {
             // Determine  if this constraint is indexable
             if ( index && isIndexable( constraints[i] ) ) {
-                if ( indexed == 0 ) {
+                if ( indexed == -1 ) {
                     // first index, so just add to the front
                     this.constraints.insertAfter( null,
                                                   new LinkedListEntry( constraints[i] ) );

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2006-10-24 02:33:24 UTC (rev 7061)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2006-10-24 02:33:30 UTC (rev 7062)
@@ -109,7 +109,7 @@
     }
 
     public InternalFactHandle get(final Declaration declaration) {
-        return get( declaration.getColumn().getIndex() );
+        return get( declaration.getColumn().getFactIndex() );
     }
 
     public Activation getActivation() {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java	2006-10-24 02:33:24 UTC (rev 7061)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java	2006-10-24 02:33:30 UTC (rev 7062)
@@ -159,6 +159,10 @@
             node.setPrevious( newNode );
             newNode.setNext( node );
             this.firstNode = newNode;
+        } else if ( existingNode == this.lastNode ) {
+        	existingNode.setNext(newNode);
+        	newNode.setPrevious( existingNode );
+        	this.lastNode = newNode;
         } else {
             ((LinkedListNode)existingNode.getNext()).setPrevious( newNode );
             newNode.setNext( existingNode.getNext() );