Revision: 629
http://stripes.svn.sourceforge.net/stripes/?rev=629&view=rev
Author: bengunter
Date: 2007-11-16 22:14:55 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
STS-435: Change clean URLs not to rely on internal forwards
Check for null return value from mergeURIParameters(...) before attempting to
wrap a MergedParameterMap around it.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2007-11-17 06:09:40 UTC (rev 628)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2007-11-17 06:14:55 UTC (rev 629)
@@ -197,7 +197,10 @@
this.parameterMap = mergeURIParameters(params);
}
else {
- this.parameterMap = new MergedParameterMap(this,
mergeURIParameters(null));
+ Map<String, String[]> params = mergeURIParameters(null);
+ if (params != null) {
+ this.parameterMap = new MergedParameterMap(this, params);
+ }
}
this.parametersInitialized = true;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
