You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2015/11/11 23:17:24 UTC
wicket git commit: use LinkedHashMap so test work with Java 7 too
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 77b451ba8 -> b498ae7f3
use LinkedHashMap so test work with Java 7 too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b498ae7f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b498ae7f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b498ae7f
Branch: refs/heads/wicket-6.x
Commit: b498ae7f3001c21982b7f1b68a4b5a6fd6ced03c
Parents: 77b451b
Author: Sven Meier <sv...@apache.org>
Authored: Wed Nov 11 23:15:54 2015 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Wed Nov 11 23:15:54 2015 +0100
----------------------------------------------------------------------
.../apache/wicket/protocol/http/mock/MockHttpServletRequest.java | 2 +-
.../protocol/http/servlet/MultipartServletWebRequestImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b498ae7f/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
index 66287ff..bc014f6 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
@@ -262,7 +262,7 @@ public class MockHttpServletRequest implements HttpServletRequest
if (uploadedFiles == null)
{
- uploadedFiles = new HashMap<String, List<UploadedFile>>();
+ uploadedFiles = new LinkedHashMap<String, List<UploadedFile>>();
}
UploadedFile uf = new UploadedFile(fieldName, file, contentType);
http://git-wip-us.apache.org/repos/asf/wicket/blob/b498ae7f/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 84c7834..f993661 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
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -119,7 +120,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
this.upload = upload;
this.fileItemFactory = factory;
parameters = new ValueMap();
- files = new HashMap<String, List<FileItem>>();
+ files = new LinkedHashMap<String, List<FileItem>>();
// Check that request is multipart
final boolean isMultipart = ServletFileUpload.isMultipartContent(request);