[jboss-svn-commits] JBL Code SVN: r17024 - in labs/jbossrules/branches/Branch_4_0_2_SOA_4_2: drools-core/src/main/java/org/drools/reteoo and 1 other directories.

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

Author: fmeyer
Date: 2007-12-04 13:24:25 -0500 (Tue, 04 Dec 2007)
New Revision: 17024

Modified:
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-compiler/src/test/resources/org/drools/integrationtests/test_RuntimeTypeCoercion.drl
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java
Log:
SOA-209 Error parsing rule that is written in a single line related to JBRULES-1314
--Thir line, and those below, will be ignored--

M    drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java
M    drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
M    drools-compiler/src/test/resources/org/drools/integrationtests/test_RuntimeTypeCoercion.drl


Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-compiler/src/test/resources/org/drools/integrationtests/test_RuntimeTypeCoercion.drl
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-compiler/src/test/resources/org/drools/integrationtests/test_RuntimeTypeCoercion.drl	2007-12-04 17:16:30 UTC (rev 17023)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-compiler/src/test/resources/org/drools/integrationtests/test_RuntimeTypeCoercion.drl	2007-12-04 18:24:25 UTC (rev 17024)
@@ -3,10 +3,8 @@
 global java.util.List results;
 
 rule "Testing coercion"
-    salience 100
 	when
 		PolymorphicFact( $value : data < 15 )
 	then
 		results.add( $value );	
 end
-

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java	2007-12-04 17:16:30 UTC (rev 17023)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java	2007-12-04 18:24:25 UTC (rev 17024)
@@ -62,7 +62,7 @@
                 final LiteralConstraint literalConstraint = (LiteralConstraint) fieldConstraint;
                 final Evaluator evaluator = literalConstraint.getEvaluator();
 
-                if ( evaluator.getOperator() == Operator.EQUAL && literalConstraint.getFieldExtractor().getValueType() != ValueType.OBJECT_TYPE ) {
+                if ( evaluator.getOperator() == Operator.EQUAL ) {
                     final int index = literalConstraint.getFieldExtractor().getIndex();
                     final FieldIndex fieldIndex = registerFieldIndex( index,
                                                                       literalConstraint.getFieldExtractor() );
@@ -107,7 +107,7 @@
                 final Evaluator evaluator = literalConstraint.getEvaluator();
                 final FieldValue value = literalConstraint.getField();
 
-                if ( evaluator.getOperator() == Operator.EQUAL && literalConstraint.getFieldExtractor().getValueType() != ValueType.OBJECT_TYPE ) {
+                if ( evaluator.getOperator() == Operator.EQUAL ) {
                     final int index = literalConstraint.getFieldExtractor().getIndex();
                     final FieldIndex fieldIndex = unregisterFieldIndex( index );
 

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java	2007-12-04 17:16:30 UTC (rev 17023)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java	2007-12-04 18:24:25 UTC (rev 17024)
@@ -357,7 +357,7 @@
 
         public ValueType getValueType() {
             //  Auto-generated method stub
-            return ValueType.STRING_TYPE;
+            return ValueType.OBJECT_TYPE;
         }
 
         public int getHashCode(InternalWorkingMemory workingMemory,