WICKET-6002 FileUploadField makes form-component models become null on submit

Use #entrySet() while looping over a map


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/374865e5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/374865e5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/374865e5

Branch: refs/heads/lambdas
Commit: 374865e57412b6447e3edf85bd211961b9270d39
Parents: e8b874f
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Sat Nov 14 13:43:14 2015 +0100
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Sat Nov 14 13:43:14 2015 +0100

----------------------------------------------------------------------
 .../protocol/http/servlet/MultipartServletWebRequestImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/374865e5/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
 
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
index 37c90b0..d0d5330 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
@@ -356,9 +356,10 @@ public class MultipartServletWebRequestImpl extends 
MultipartServletWebRequest
        protected Map<String, List<StringValue>> generatePostParameters()
        {
                Map<String, List<StringValue>> res = new HashMap<>();
-               for (String key : parameters.keySet())
+               for (Map.Entry<String, Object> entry : parameters.entrySet())
                {
-                       String[] val = (String[])parameters.get(key);
+                       String key = entry.getKey();
+                       String[] val = (String[])entry.getValue();
                        if (val != null && val.length > 0)
                        {
                                List<StringValue> items = new ArrayList<>();

Reply via email to