Author: adrianc Date: Mon Jun 8 16:14:45 2015 New Revision: 1684217 URL: http://svn.apache.org/r1684217 Log: Revert rev 1684133 and fix the compiler error properly.
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java?rev=1684217&r1=1684216&r2=1684217&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Mon Jun 8 16:14:45 2015 @@ -68,8 +68,8 @@ public final class EntityFieldMap extend return Collections.unmodifiableSet(this.fieldMap.keySet()).iterator(); } - public Iterator<?> getFieldEntryIterator() { - return Collections.unmodifiableMap(this.fieldMap).entrySet().iterator(); + public Iterator<Map.Entry<String, Object>> getFieldEntryIterator() { + return Collections.<String, Object>unmodifiableMap(this.fieldMap).entrySet().iterator(); } @Override