You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ofbiz.apache.org by mb...@apache.org on 2015/06/20 13:43:31 UTC

svn commit: r1686570 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java

Author: mbrohl
Date: Sat Jun 20 11:43:30 2015
New Revision: 1686570

URL: http://svn.apache.org/r1686570
Log:
Applied changes for OFBIZ-6300: Compiler-Error with JDK 1.8 and source compatibility 1.8.

This reintroduces type safety for getFieldentryIterator.

Thanks Martin Becker for providing the patch.

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=1686570&r1=1686569&r2=1686570&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 Sat Jun 20 11:43:30 2015
@@ -68,8 +68,8 @@ public final class EntityFieldMap extend
         return Collections.unmodifiableSet(this.fieldMap.keySet()).iterator();
     }
 
-    public Iterator<Map.Entry<String, Object>> getFieldEntryIterator() {
-        return Collections.<String, Object>unmodifiableMap(this.fieldMap).entrySet().iterator();
+    public Iterator<Map.Entry<String, ? extends Object>> getFieldEntryIterator() {
+        return Collections.<Map.Entry<String, ? extends Object>>unmodifiableSet(this.fieldMap.entrySet()).iterator();
     }
 
     @Override