[jboss-svn-commits] JBL Code SVN: r20279 - labs/jbossrules/branches/parser-rewrite/drools-compiler/src/main/java/org/drools/lang/descr.

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

Author: porcelli
Date: 2008-06-03 18:50:35 -0400 (Tue, 03 Jun 2008)
New Revision: 20279

Modified:
   labs/jbossrules/branches/parser-rewrite/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
Log:
Bug fix: Now do not create RestrictionConnectiveDescr for eval.

Modified: labs/jbossrules/branches/parser-rewrite/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
===================================================================
--- labs/jbossrules/branches/parser-rewrite/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2008-06-03 21:43:52 UTC (rev 20278)
+++ labs/jbossrules/branches/parser-rewrite/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2008-06-03 22:50:35 UTC (rev 20279)
@@ -647,7 +647,7 @@
 	public BaseDescr createOrRestrictionConnective(BaseDescr left,
 			BaseDescr right) {		
 		BaseDescr or = null;
-		if (left instanceof RestrictionDescr) {
+		if (left instanceof RestrictionDescr && !(left instanceof PredicateDescr)) {
 			RestrictionConnectiveDescr restOr = new RestrictionConnectiveDescr(
 					RestrictionConnectiveDescr.OR);
 			restOr.addOrMerge((RestrictionDescr) left);
@@ -667,7 +667,7 @@
 	public BaseDescr createAndRestrictionConnective(BaseDescr left,
 			BaseDescr right) {
 		BaseDescr and = null;
-		if (left instanceof RestrictionDescr) {
+		if (left instanceof RestrictionDescr  && !(left instanceof PredicateDescr)) {
 			RestrictionConnectiveDescr restAnd = new RestrictionConnectiveDescr(
 					RestrictionConnectiveDescr.AND);
 			restAnd.addOrMerge((RestrictionDescr) left);