ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrisal...@apache.org
Subject svn commit: r1075521 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
Date Mon, 28 Feb 2011 20:36:30 GMT
Author: mrisaliti
Date: Mon Feb 28 20:36:29 2011
New Revision: 1075521

URL: http://svn.apache.org/viewvc?rev=1075521&view=rev
Log:
Remove some warning in EntityFinderUtil (OFBIZ-4102)

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=1075521&r1=1075520&r2=1075521&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 Mon Feb
28 20:36:29 2011
@@ -99,7 +99,7 @@ public class EntityFinderUtil {
             for (Map.Entry<FlexibleMapAccessor<Object>, Object> entry: fieldMap.entrySet())
{
                 FlexibleMapAccessor<Object> serviceContextFieldAcsr = entry.getKey();
                 Object valueSrc = entry.getValue();
-                if (valueSrc instanceof FlexibleMapAccessor) {
+                if (valueSrc instanceof FlexibleMapAccessor<?>) {
                     FlexibleMapAccessor<Object> contextEnvAcsr = cast(valueSrc);
                     serviceContextFieldAcsr.put(outContext, contextEnvAcsr.get(context));
                 } else if (valueSrc instanceof FlexibleStringExpander) {
@@ -219,7 +219,7 @@ public class EntityFinderUtil {
 
             // don't convert the field to the desired type if this is an IN or BETWEEN operator
and we have a Collection
             if (!((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN)
|| operator.equals(EntityOperator.NOT_IN))
-                    && value instanceof Collection)) {
+                    && value instanceof Collection<?>)) {
                 // now to a type conversion for the target fieldName
                 value = modelEntity.convertFieldValue(modelEntity.getField(fieldName), value,
modelFieldTypeReader, context);
             }



Mime
View raw message