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

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

Author: mark.proctor at jboss.com
Date: 2006-10-25 12:24:40 -0400 (Wed, 25 Oct 2006)
New Revision: 7112

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractBaseLinkedListNode.java
Log:


Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2006-10-25 15:49:16 UTC (rev 7111)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2006-10-25 16:24:40 UTC (rev 7112)
@@ -50,6 +50,7 @@
 import org.drools.spi.FactHandleFactory;
 import org.drools.spi.GlobalResolver;
 import org.drools.spi.PropagationContext;
+import org.drools.util.LinkedList;
 import org.drools.util.ObjectHashMap;
 import org.drools.util.PrimitiveLongMap;
 import org.drools.util.ObjectHashMap.ObjectEntry;
@@ -114,7 +115,7 @@
     /** Rule-firing agenda. */
     protected DefaultAgenda                   agenda;
 
-    protected final List                      factQueue                                     = new ArrayList();
+    protected final List                      factQueue                                     = new ArrayList();   
 
     protected final ReentrantLock             lock                                          = new ReentrantLock();
 
@@ -142,10 +143,9 @@
         this.ruleBase = ruleBase;
         this.handleFactory = handleFactory;
         this.tms = new TruthMaintenanceSystem( this );
+        this.assertMap = new ObjectHashMap();
         final RuleBaseConfiguration conf = this.ruleBase.getConfiguration();
 
-        this.assertMap = new ObjectHashMap();
-
         if ( RuleBaseConfiguration.WM_BEHAVIOR_IDENTITY.equals( conf.getProperty( RuleBaseConfiguration.PROPERTY_ASSERT_BEHAVIOR ) ) ) {
             this.assertMap.setComparator( new IdentityAssertMapComparator( this.handleFactory.getFactHandleType() ) );
         } else {
@@ -940,8 +940,8 @@
 
     public void clearNodeMemory(final NodeMemory node) {
         this.nodeMemories.remove( node.getId() );
-    }
-
+    }  
+    
     public WorkingMemoryEventSupport getWorkingMemoryEventSupport() {
         return this.workingMemoryEventSupport;
     }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java	2006-10-25 15:49:16 UTC (rev 7111)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java	2006-10-25 16:24:40 UTC (rev 7112)
@@ -44,14 +44,14 @@
 
     private static final long           serialVersionUID = 320L;
 
-    private final AbstractWorkingMemory WorkingMemory;
+    private final AbstractWorkingMemory workingMemory;
 
     private final PrimitiveLongMap      justifiedMap;
 
     private final ObjectHashMap         assertMap;
 
     public TruthMaintenanceSystem(final AbstractWorkingMemory workingMemory) {
-        this.WorkingMemory = workingMemory;
+        this.workingMemory = workingMemory;
 
         this.justifiedMap = new PrimitiveLongMap( 8,
                                                   32 );
@@ -112,7 +112,7 @@
                     this.justifiedMap.remove( handle.getId() );
                     // this needs to be scheduled so we don't upset the current
                     // working memory operation
-                    this.WorkingMemory.queueRetractAction( handle,
+                    this.workingMemory.queueRetractAction( handle,
                                                            false,
                                                            true,
                                                            context.getRuleOrigin(),
@@ -162,6 +162,9 @@
         activation.addLogicalDependency( node );
         Set set = (Set) this.justifiedMap.get( handle.getId() );
         if ( set == null ) {
+            if ( context.getType() == PropagationContext.MODIFICATION ) {
+                // if this was a  modify, chances  are its trying  to retract a logical assertion
+            }
             set = new HashSet();
             this.justifiedMap.put( handle.getId(),
                                    set );

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractBaseLinkedListNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractBaseLinkedListNode.java	2006-10-25 15:49:16 UTC (rev 7111)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractBaseLinkedListNode.java	2006-10-25 16:24:40 UTC (rev 7112)
@@ -28,7 +28,7 @@
     implements
     LinkedListNode {
 
-    private static final long serialVersionUID = -3926700105253864146L;
+    private static final long serialVersionUID = 320L;
 
     private LinkedListNode previous;