Revision: 920
http://stripes.svn.sourceforge.net/stripes/?rev=920&view=rev
Author: bengunter
Date: 2008-05-21 06:42:36 -0700 (Wed, 21 May 2008)
Log Message:
-----------
Fixed a couple of NPEs that can appear under some rare circumstances.
Specifically, when StripesFilter catches an exception and does not get a chance
to do what it normally does with the StripesRequestWrapper before other code
touches 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
2008-05-21 12:54:03 UTC (rev 919)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2008-05-21 13:42:36 UTC (rev 920)
@@ -171,7 +171,7 @@
* parameters from the query string and/or request body.
*/
@Override
- public Map<String, String[]> getParameterMap() {
+ public MergedParameterMap getParameterMap() {
if (this.parameterMap == null) {
if (isMultipart())
this.parameterMap = new MergedParameterMap(this,
this.multipart);
@@ -187,7 +187,7 @@
* previous URI parameters.
*/
public void pushUriParameters(HttpServletRequestWrapper request) {
- this.parameterMap.pushUriParameters(request);
+ getParameterMap().pushUriParameters(request);
}
/**
@@ -195,7 +195,7 @@
* [EMAIL PROTECTED] #pushUriParameters(HttpServletRequestWrapper)}.
*/
public void popUriParameters() {
- this.parameterMap.popUriParameters();
+ getParameterMap().popUriParameters();
}
/**
@@ -438,7 +438,7 @@
* [EMAIL PROTECTED] #pushUriParameters(HttpServletRequestWrapper)}.
*/
public void popUriParameters() {
- if (this.uriParamStack.isEmpty()) {
+ if (this.uriParamStack == null || this.uriParamStack.isEmpty()) {
this.uriParams = null;
}
else {
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 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
