Revision: 645
http://stripes.svn.sourceforge.net/stripes/?rev=645&view=rev
Author: bengunter
Date: 2007-12-04 09:18:08 -0800 (Tue, 04 Dec 2007)
Log Message:
-----------
STS-435: Change clean URLs not to rely on internal forwards.
It was flawed logic to try to maintain a stack of requests so that we always
have access to any parameters that might be added by wrappers above the stripes
wrapper. If a wrapper above the stripes wrapper modifies the parameters then it
is up to that wrapper to deal with merging the values. The request stack is
gone now.
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-12-04 17:07:37 UTC (rev 644)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2007-12-04 17:18:08 UTC (rev 645)
@@ -301,7 +301,6 @@
}
private HttpServletRequestWrapper request;
- private Stack<HttpServletRequestWrapper> requestStack;
private Map<String, String[]> uriParams;
private Stack<Map<String, String[]>> uriParamStack;
@@ -430,13 +429,10 @@
public void pushUriParameters(HttpServletRequestWrapper request) {
if (this.uriParamStack == null) {
this.uriParamStack = new Stack<Map<String, String[]>>();
- this.requestStack = new Stack<HttpServletRequestWrapper>();
}
Map<String, String[]> map = getUriParameters(request);
this.uriParamStack.push(this.uriParams);
this.uriParams = mergeParameters(this.uriParams, map);
- this.requestStack.push(request);
- this.request = request;
}
/**
@@ -446,11 +442,9 @@
public void popUriParameters() {
if (this.uriParamStack.isEmpty()) {
this.uriParams = null;
- this.request = null;
}
else {
this.uriParams = this.uriParamStack.pop();
- this.request = this.requestStack.pop();
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
