Author: ivaynberg
Date: Sun Sep 28 21:10:42 2008
New Revision: 699982
URL: http://svn.apache.org/viewvc?rev=699982&view=rev
Log:
fix unit test
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=699982&r1=699981&r2=699982&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Sun Sep 28 21:10:42 2008
@@ -681,21 +681,21 @@
else
{
final StringBuffer buf = new StringBuffer();
- for (Iterator iterator = parameters.keySet().iterator();
iterator.hasNext();)
- {
- final String name = (String)iterator.next();
- final String value = parameters.getString(name);
- if (name != null)
- buf.append(WicketURLEncoder.QUERY_INSTANCE.encode(name));
- buf.append('=');
- if (value != null)
- buf.append(WicketURLEncoder.QUERY_INSTANCE.encode(value));
- if (iterator.hasNext())
- {
- buf.append('&');
- }
- }
- return buf.toString();
+ for (Iterator iterator =
parameters.keySet().iterator(); iterator.hasNext();)
+ {
+ final String name = (String)iterator.next();
+ final String value = parameters.getString(name);
+ if (name != null)
+
buf.append(WicketURLEncoder.QUERY_INSTANCE.encode(name));
+ buf.append('=');
+ if (value != null)
+
buf.append(WicketURLEncoder.QUERY_INSTANCE.encode(value));
+ if (iterator.hasNext())
+ {
+ buf.append('&');
+ }
+ }
+ return buf.toString();
}
}
@@ -1224,6 +1224,16 @@
auto = auto.substring(idx +
WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME.length() + 1);
}
+ else
+ {
+ // additional check for crypted strategy
+ idx = auto.indexOf("x=6*");
+ if (idx >= 0)
+ {
+ auto = auto.substring(idx + 4);
+ }
+ }
+
idx = auto.indexOf("&");
if (idx >= 0)
{
