diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java index 4de55045bb..222d30ee19 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java @@ -154,10 +154,8 @@ public abstract class EntityComparisonOperator extends EntityOperatorcast(leftValue), UtilGenerics.cast(rightValue)); + return leftValue == WILDCARD || rightValue == WILDCARD + || compare(UtilGenerics.cast(leftValue), UtilGenerics.cast(rightValue)); } @Override diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java index 18a2c359c4..941fa5ccee 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java @@ -94,8 +94,7 @@ public abstract class EntityConditionListBase extends } EntityConditionListBase other = UtilGenerics.cast(obj); - boolean isEqual = conditionList.equals(other.conditionList) && operator.equals(other.operator); - return isEqual; + return conditionList.equals(other.conditionList) && operator.equals(other.operator); } @Override diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java index ecad1bf39a..a341c7b9e2 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java @@ -264,10 +264,8 @@ public final class EntityExpr extends EntityCondition { return false; } EntityExpr other = (EntityExpr) obj; - boolean isEqual = equals(lhs, other.lhs) && - equals(operator, other.operator) && - equals(rhs, other.rhs); - return isEqual; + return equals(lhs, other.lhs) && equals(operator, other.operator) + && equals(rhs, other.rhs); } @Override diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java index ef56dbad79..f2ca726e0b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java @@ -111,16 +111,8 @@ public class EntityFieldValue extends EntityConditionValue { return false; } EntityFieldValue otherValue = (EntityFieldValue) obj; - if (!fieldName.equals(otherValue.fieldName)) { - return false; - } - if (UtilMisc.compare(this.entityAlias, otherValue.entityAlias) != 0) { - return false; - } - if (UtilMisc.compare(this.entityAliasStack, otherValue.entityAliasStack) != 0) { - return false; - } - return true; + return fieldName.equals(otherValue.fieldName) && !(UtilMisc.compare(this.entityAlias, otherValue.entityAlias) != 0) + && !(UtilMisc.compare(this.entityAliasStack, otherValue.entityAliasStack) != 0); } @Override diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java index f9c5d40a98..2922bf3555 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java @@ -116,10 +116,7 @@ public class EntityJoinOperator extends EntityOperator map, EntityCondition lhs, EntityCondition rhs) { - if (lhs.mapMatches(delegator, map) == shortCircuitValue) { - return shortCircuitValue; - } - if (rhs.mapMatches(delegator, map) == shortCircuitValue) { + if (lhs.mapMatches(delegator, map) == shortCircuitValue || rhs.mapMatches(delegator, map) == shortCircuitValue) { return shortCircuitValue; } return !shortCircuitValue;