svn commit: r834819 - in /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters: ParameterMap.java Util.java

[fmeschbe]

Author: fmeschbe
Date: Wed Nov 11 09:38:35 2009
New Revision: 834819

URL: http://svn.apache.org/viewvc?rev=834819&view=rev
Log:
SLING-1178 Apply extended patch by Tobias Bocanegra (thanks)

Modified:
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java?rev=834819&r1=834818&r2=834819&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
 Wed Nov 11 09:38:35 2009
@@ -19,7 +19,7 @@
 package org.apache.sling.engine.impl.parameters;
 
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.sling.api.request.RequestParameter;
@@ -28,7 +28,7 @@
 /**
  * The <code>ParameterMap</code> TODO
  */
-class ParameterMap extends HashMap<String, RequestParameter[]> implements
+class ParameterMap extends LinkedHashMap<String, RequestParameter[]> implements
         RequestParameterMap {
 
     private Map<String, String[]> stringParameterMap;
@@ -81,7 +81,7 @@
 
     Map<String, String[]> getStringParameterMap() {
         if (this.stringParameterMap == null) {
-            Map<String, String[]> pm = new HashMap<String, String[]>();
+            LinkedHashMap<String, String[]> pm = new LinkedHashMap<String, 
String[]>();
             for (Map.Entry<String, RequestParameter[]> ppmEntry : entrySet()) {
                 pm.put(ppmEntry.getKey(), toStringArray(ppmEntry.getValue()));
             }

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java?rev=834819&r1=834818&r2=834819&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
 Wed Nov 11 09:38:35 2009
@@ -21,7 +21,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.sling.api.request.RequestParameter;
@@ -96,7 +96,7 @@
         }
 
         // map for rename parameters due to encoding fixes
-        Map<String, String> renameMap = new HashMap<String, String>();
+        LinkedHashMap<String, String> renameMap = new LinkedHashMap<String, 
String>();
 
         // convert the map of lists to a map of arrays
         for (Map.Entry<String, RequestParameter[]> paramEntry : 
parameterMap.entrySet()) {