svn commit: r730012 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java

[jd...@apache.org]

Author: jdonnerstag
Date: Mon Dec 29 15:23:42 2008
New Revision: 730012

URL: http://svn.apache.org/viewvc?rev=730012&view=rev
Log:
wicket-1876: applied change to MockHttpServletRequest to handle querystring parameters according to the servlet spec.

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=730012&r1=730011&r2=730012&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java Mon Dec 29 15:23:42 2008
@@ -16,12 +16,6 @@
  */
 package org.apache.wicket.protocol.http;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -43,6 +37,13 @@
 import java.util.Locale;
 import java.util.Map;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 import org.apache.wicket.Application;
 import org.apache.wicket.Component;
 import org.apache.wicket.IPageMap;
@@ -1151,7 +1152,9 @@
 			path = url.substring(0, index);
 
 			String queryString = url.substring(index + 1);
-			RequestUtils.decodeParameters(queryString, parameters);
+			Map<String, String[]> params = new HashMap<String, String[]>();
+			RequestUtils.decodeUrlParameters(queryString, params);
+			parameters.putAll(params);
 		}
 	}