You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/02 13:55:45 UTC
svn commit: r810465 -
/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
Author: jleroux
Date: Wed Sep 2 11:55:44 2009
New Revision: 810465
URL: http://svn.apache.org/viewvc?rev=810465&view=rev
Log:
Fix an issue reported by André Herbst at http://markmail.org/thread/wgqhbyr5qo6j44yq. Related to r810438
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=810465&r1=810464&r2=810465&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Wed Sep 2 11:55:44 2009
@@ -198,7 +198,7 @@
}
// If IN or BETWEEN operator, see if value is a literal list and split it
- if ((operator == EntityOperator.IN || operator == EntityOperator.BETWEEN)
+ if ((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN))
&& value instanceof String) {
String delim = null;
if (((String)value).indexOf("|") >= 0) {
@@ -216,7 +216,7 @@
}
// don't convert the field to the desired type if this is an IN or BETWEEN operator and we have a Collection
- if (!((operator == EntityOperator.IN || operator == EntityOperator.BETWEEN)
+ if (!((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN))
&& value instanceof Collection)) {
// now to a type conversion for the target fieldName
value = modelEntity.convertFieldValue(modelEntity.getField(fieldName), value, modelFieldTypeReader, context);