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

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

Author: mark.proctor at jboss.com
Date: 2008-03-28 00:58:25 -0400 (Fri, 28 Mar 2008)
New Revision: 19286

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
Log:
JBRULES-1520 RightTuple merge for asymmetrical Rete propagations
-reformatted

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2008-03-28 04:57:45 UTC (rev 19285)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2008-03-28 04:58:25 UTC (rev 19286)
@@ -197,7 +197,9 @@
         final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
         memory.betaMemory.getLeftTupleMemory().remove( leftTuple );
 
-        this.sink.propagateRetractLeftTupleDestroyRightTuple( leftTuple, context, workingMemory );
+        this.sink.propagateRetractLeftTupleDestroyRightTuple( leftTuple,
+                                                              context,
+                                                              workingMemory );
     }
 
     /**
@@ -344,13 +346,17 @@
     public void updateSink(final LeftTupleSink sink,
                            final PropagationContext context,
                            final InternalWorkingMemory workingMemory) {
-                final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
-                
-                final Iterator tupleIter = memory.betaMemory.getLeftTupleMemory().iterator();
-                for ( LeftTuple leftTuple = (LeftTuple) tupleIter.next(); leftTuple != null; leftTuple = (LeftTuple) tupleIter.next() ) {
-                    RightTuple rightTuple = leftTuple.getBetaChildren().getRightParent();
-                    sink.assertLeftTuple( new LeftTuple( leftTuple, rightTuple, sink), context, workingMemory );
-                }
+        final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
+
+        final Iterator tupleIter = memory.betaMemory.getLeftTupleMemory().iterator();
+        for ( LeftTuple leftTuple = (LeftTuple) tupleIter.next(); leftTuple != null; leftTuple = (LeftTuple) tupleIter.next() ) {
+            RightTuple rightTuple = leftTuple.getBetaChildren().getRightParent();
+            sink.assertLeftTuple( new LeftTuple( leftTuple,
+                                                 rightTuple,
+                                                 sink ),
+                                  context,
+                                  workingMemory );
+        }
     }
 
     /* (non-Javadoc)