[jboss-svn-commits] JBL Code SVN: r9345 - 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: 2007-02-05 09:09:31 -0500 (Mon, 05 Feb 2007)
New Revision: 9345

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/EqualityAssertMapComparator.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
Log:
-moved getClass() == X.class to isntanceof as its actually faster, less bytecode.

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	2007-02-05 14:04:25 UTC (rev 9344)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-02-05 14:09:31 UTC (rev 9345)
@@ -151,9 +151,9 @@
         
         
         if ( conf.getAssertBehaviour() == AssertBehaviour.IDENTITY ) {
-            this.assertMap.setComparator( new IdentityAssertMapComparator( this.handleFactory.getFactHandleType() ) );
+            this.assertMap.setComparator( new IdentityAssertMapComparator( ) );
         } else {
-            this.assertMap.setComparator( new EqualityAssertMapComparator( this.handleFactory.getFactHandleType() ) );
+            this.assertMap.setComparator( new EqualityAssertMapComparator( ) );
         }
 
         // Only takes effect if are using idententity behaviour for assert        

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java	2007-02-05 14:04:25 UTC (rev 9344)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java	2007-02-05 14:09:31 UTC (rev 9345)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.drools.FactHandle;
 import org.drools.base.ShadowProxy;
 import org.drools.util.AbstractHashTable.ObjectComparator;
 
@@ -25,16 +26,14 @@
     /**
      * 
      */
-    private static final long serialVersionUID = -320L;
+    private static final long serialVersionUID = 320L;
 
-    private final Class       factHandleClass;
 
-    public EqualityAssertMapComparator(final Class factHandleClass) {
-        this.factHandleClass = factHandleClass;
+    public EqualityAssertMapComparator() {
     }
 
     public int hashCodeOf(final Object obj) {
-        if ( obj.getClass() == this.factHandleClass ) {
+        if ( obj instanceof FactHandle ) {
             return rehash( ((InternalFactHandle) obj).getObjectHashCode() );
         }
         return rehash( obj.hashCode() );
@@ -54,7 +53,7 @@
      */
     public boolean equal(final Object o1,
                          Object o2) {
-        if ( o1.getClass() == this.factHandleClass ) {
+        if ( o1 instanceof FactHandle ) {
             return o1 == o2;
         }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java	2007-02-05 14:04:25 UTC (rev 9344)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java	2007-02-05 14:09:31 UTC (rev 9345)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.drools.FactHandle;
 import org.drools.base.ShadowProxy;
 import org.drools.util.AbstractHashTable.ObjectComparator;
 
@@ -27,14 +28,11 @@
      */
     private static final long serialVersionUID = 320L;
 
-    private final Class       factHandleClass;
-
-    public IdentityAssertMapComparator(final Class factHandleClass) {
-        this.factHandleClass = factHandleClass;
+    public IdentityAssertMapComparator() {
     }
 
     public int hashCodeOf(final Object obj) {
-        if ( obj.getClass() == this.factHandleClass ) {
+        if ( obj instanceof FactHandle ) {
             return rehash( ((InternalFactHandle) obj).getObjectHashCode() );
         }
         return rehash( obj.hashCode() );
@@ -54,7 +52,7 @@
      */
     public boolean equal(final Object o1,
                          final Object o2) {
-        if ( o1.getClass() == this.factHandleClass ) {
+        if ( o1 instanceof FactHandle ) {
             return ((InternalFactHandle) o1).getObject() == ((InternalFactHandle) o2).getObject();
         }