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

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

Author: mark.proctor at jboss.com
Date: 2006-10-24 11:13:00 -0400 (Tue, 24 Oct 2006)
New Revision: 7086

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectSourceTest.java
Log:
-Fixed ObjectSource, which wasn't reporting the correct size, and its relevant unit test.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java	2006-10-24 14:34:36 UTC (rev 7085)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java	2006-10-24 15:13:00 UTC (rev 7086)
@@ -363,10 +363,10 @@
     }
 
     public int size() {
-    	int size;
-        size =+ ( ( otherSinks != null ) ? otherSinks.size() : 0);
-        size =+ (( hashableSinks != null ) ? hashableSinks.size() : 0);
-        size =+ ( ( hashedSinkMap != null ) ? hashedSinkMap.size() : 0);
+    	int size = 0;
+        size += ( ( otherSinks != null ) ? otherSinks.size() : 0);
+        size += ( ( hashableSinks != null ) ? hashableSinks.size() : 0);
+        size += ( ( hashedSinkMap != null ) ? hashedSinkMap.size() : 0);
         return size;
     }
 

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 14:34:36 UTC (rev 7085)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java	2006-10-24 15:13:00 UTC (rev 7086)
@@ -39,6 +39,7 @@
     }
 
     public Object getValue(final Object object) {
+        //return object;
         return ( this.objectType.isShadowEnabled() ) ? ((ShadowProxy)object).getShadowedObject() : object;
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectSourceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectSourceTest.java	2006-10-24 14:34:36 UTC (rev 7085)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectSourceTest.java	2006-10-24 15:13:00 UTC (rev 7086)
@@ -42,7 +42,7 @@
         field.setAccessible( true );
         ObjectSinkPropagator sink = (ObjectSinkPropagator) field.get( source );
 
-        assertNull( sink );
+        assertSame( EmptyObjectSinkAdapter.getInstance(), sink );
 
         final MockObjectSink sink1 = new MockObjectSink();
         source.addObjectSink( sink1 );
@@ -79,5 +79,12 @@
                     sink.getClass() );
         assertEquals( 1,
                       sink.getSinks().length );
+
+        source.removeObjectSink( sink3 );
+        sink = (ObjectSinkPropagator) field.get( source );
+        assertSame( EmptyObjectSinkAdapter.getInstance(),
+                    sink );
+        assertEquals( 0,
+                      sink.getSinks().length );                     
     }
 }
\ No newline at end of file