Author: ehillenius
Date: Fri Apr 13 11:48:26 2007
New Revision: 528584
URL: http://svn.apache.org/viewvc?view=rev&rev=528584
Log:
check on strings vs string arrays
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java?view=diff&rev=528584&r1=528583&r2=528584
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
Fri Apr 13 11:48:26 2007
@@ -452,7 +452,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();
+ }
}
/**
@@ -472,7 +491,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() };
+ }
}
/**
