Author: ehillenius
Date: Fri Apr 13 18:03:21 2007
New Revision: 528728
URL: http://svn.apache.org/viewvc?view=rev&rev=528728
Log:
fix for tooy li
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java?view=diff&rev=528728&r1=528727&r2=528728
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
Fri Apr 13 18:03:21 2007
@@ -455,7 +455,26 @@
{
return null;
}
- return (String)this.parameterMap.get(key);
+
+ Object val = this.parameterMap.get(key);
+ if (val == null)
+ {
+ return null;
+ }
+ else if (val instanceof String[])
+ {
+ String[] arrayVal = (String[])val;
+ return arrayVal.length > 0 ? arrayVal[0] : null;
+ }
+ else if (val instanceof String)
+ {
+ return (String)val;
+ }
+ else
+ {
+ // never happens, just being defensive
+ return val.toString();
+ }
}
/**
@@ -477,7 +496,25 @@
{
return null;
}
- return (String[])this.parameterMap.get(key);
+
+ Object val = this.parameterMap.get(key);
+ if (val == null)
+ {
+ return null;
+ }
+ else if (val instanceof String[])
+ {
+ return (String[])val;
+ }
+ else if (val instanceof String)
+ {
+ return new String[] { (String)val };
+ }
+ else
+ {
+ // never happens, just being defensive
+ return new String[] { val.toString() };
+ }
}
/**
