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

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

Author: mark.proctor at jboss.com
Date: 2010-07-28 00:39:28 -0400 (Wed, 28 Jul 2010)
New Revision: 34242

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
Log:
JBRULES-2601 Remove DisconnectedFactHandle and make DefaultFactHandle capable of being disconnected
-Added boolean flag for disconnected

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java	2010-07-28 04:34:31 UTC (rev 34241)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java	2010-07-28 04:39:28 UTC (rev 34242)
@@ -56,12 +56,14 @@
     private int                     objectHashCode;
     private int                     identityHashCode;
     
-    public RightTuple              firstRightTuple;
-    public RightTuple              lastRightTuple;
+    public RightTuple               firstRightTuple;
+    public RightTuple               lastRightTuple;
     
     public LeftTuple                firstLeftTuple;
     public LeftTuple                lastLeftTuple;
     private WorkingMemoryEntryPoint entryPoint;
+    
+    private boolean                 disconnected;
 
     // ----------------------------------------------------------------------
     // Constructors
@@ -76,7 +78,7 @@
         this( id,
               object,
               id,
-              new DisconnectedWorkingMemoryEntryPoint( EntryPoint.DEFAULT.getEntryPointId() ) );
+              null );
     }
 
     /**
@@ -113,6 +115,7 @@
         this.objectHashCode = objectHashCode;
         this.recency = recency;
         this.object = object;
+        this.disconnected = true;
     }    
         
     // ----------------------------------------------------------------------
@@ -142,14 +145,11 @@
         this.lastLeftTuple = null;
         this.lastRightTuple = null;
         this.entryPoint =  (this.entryPoint == null) ? null : new DisconnectedWorkingMemoryEntryPoint( this.entryPoint.getEntryPointId() );
+        this.disconnected = true;
     }
     
     public boolean isDisconnected() {
-        if ( this.entryPoint instanceof DisconnectedWorkingMemoryEntryPoint ) {
-            return true;
-        } else {
-            return false;
-        }
+        return disconnected;
     }
 
     public int getObjectHashCode() {
@@ -300,6 +300,7 @@
         
         clone.objectHashCode = this.objectHashCode;
         clone.identityHashCode = System.identityHashCode( clone.object );
+        clone.disconnected = this.disconnected;
         return clone;
     }
 
@@ -332,5 +333,6 @@
         this.objectHashCode = Integer.parseInt( elements[3] );
         this.recency = Long.parseLong( elements[4] );
         this.entryPoint = StringUtils.isEmpty( elements[5] ) ? null : new DisconnectedWorkingMemoryEntryPoint( elements[5].trim() );
+        this.disconnected = true;
     }    
 }