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

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

Author: mark.proctor at jboss.com
Date: 2006-10-24 06:03:23 -0400 (Tue, 24 Oct 2006)
New Revision: 7072

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java
Log:
-Added fixes for waltz to run waltz50

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java	2006-10-24 10:03:13 UTC (rev 7071)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java	2006-10-24 10:03:23 UTC (rev 7072)
@@ -140,13 +140,13 @@
 
         final Object object = handle.getObject();
 
-        ObjectTypeNode[] cachedNodes;
-        // //@todo this  is a hack, we really  don't want to be doing instanceof here 
-        if ( object instanceof ShadowProxy ){
-        	cachedNodes = (ObjectTypeNode[]) memory.get( object.getClass().getSuperclass() );
-        } else {
-        	cachedNodes = (ObjectTypeNode[]) memory.get( object.getClass() );	
-        }
+        ObjectTypeNode[] cachedNodes = (ObjectTypeNode[]) memory.get( object.getClass().getSuperclass() );
+//        // //@todo this  is a hack, we really  don't want to be doing instanceof here 
+//        if ( object instanceof ShadowProxy ){
+//        	
+//        } else {
+//        	cachedNodes = (ObjectTypeNode[]) memory.get( object.getClass() );	
+//        }
          
         if ( cachedNodes == null ) {
             // it is  possible that there are no ObjectTypeNodes for an  object being retracted

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java	2006-10-24 10:03:13 UTC (rev 7071)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java	2006-10-24 10:03:23 UTC (rev 7072)
@@ -31,7 +31,7 @@
     /**
      * 
      */
-    private static final long serialVersionUID = 9055898682913511836L;
+    private static final long serialVersionUID = 320L;
     private ObjectType        objectType;
 
     public ColumnExtractor(final ObjectType objectType) {
@@ -39,7 +39,8 @@
     }
 
     public Object getValue(final Object object) {
-        return ( object instanceof ShadowProxy ) ? ((ShadowProxy)object).getShadowedObject() : object;
+        return object;
+        //return ( this.objectType.isShadowEnabled() ) ? ((ShadowProxy)object).getShadowedObject() : object;
     }
 
     public ObjectType getObjectType() {