cziegeler 02/01/21 03:00:35
Modified: src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java RequestWrapper.java
Log:
Fixing getRequestURI for internal requests. This bug was reported really ages ago...
Revision Changes Path
1.2 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnvironmentWrapper.java 3 Jan 2002 12:31:16 -0000 1.1
+++ EnvironmentWrapper.java 21 Jan 2002 11:00:34 -0000 1.2
@@ -30,7 +30,7 @@
* contains a <code>RequestWrapper</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: EnvironmentWrapper.java,v 1.1 2002/01/03 12:31:16 giacomo Exp $
+ * @version $Id: EnvironmentWrapper.java,v 1.2 2002/01/21 11:00:34 cziegeler Exp $
*/
public final class EnvironmentWrapper
extends AbstractEnvironment
@@ -84,6 +84,7 @@
this.request = new
RequestWrapper((Request)oldObjectModel.get(Constants.REQUEST_OBJECT),
requestURI, queryString, this);
this.objectModel.put(Constants.REQUEST_OBJECT, this.request);
+ this.objectModel.put("Internal-Request", "true");
}
/**
1.2 +2 -6
xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
Index: RequestWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestWrapper.java 3 Jan 2002 12:31:16 -0000 1.1
+++ RequestWrapper.java 21 Jan 2002 11:00:34 -0000 1.2
@@ -23,16 +23,13 @@
* are different.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: RequestWrapper.java,v 1.1 2002/01/03 12:31:16 giacomo Exp $
+ * @version $Id: RequestWrapper.java,v 1.2 2002/01/21 11:00:34 cziegeler Exp $
*/
public final class RequestWrapper implements Request {
/** The real Request object */
private Request req;
- /** The requested uri */
- private String requestURI;
-
/** The query string */
private String queryString;
@@ -51,7 +48,6 @@
Environment env) {
this.environment = env;
this.req = request;
- this.requestURI = requestURI;
this.queryString = queryString;
this.parameters = new RequestParameters(queryString);
if (this.req.getQueryString() != null) {
@@ -231,7 +227,7 @@
}
public String getRequestURI() {
- return this.requestURI;
+ return this.req.getRequestURI();
}
public String getSitemapURI() {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
