luehe 2003/10/01 09:15:33
Modified: jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
Log:
Fixed indentation
Revision Changes Path
1.55 +16 -16
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PageContextImpl.java 19 Sep 2003 21:24:47 -0000 1.54
+++ PageContextImpl.java 1 Oct 2003 16:15:33 -0000 1.55
@@ -692,24 +692,24 @@
// Make sure that the response object is not the wrapper for include
while (response instanceof ServletResponseWrapperInclude) {
response = ((ServletResponseWrapperInclude)response).getResponse();
- }
+ }
- final String path = getAbsolutePathRelativeToContext(relativeUrlPath);
- String includeUri
- = (String) request.getAttribute(Constants.INC_SERVLET_PATH);
+ final String path = getAbsolutePathRelativeToContext(relativeUrlPath);
+ String includeUri
+ = (String) request.getAttribute(Constants.INC_SERVLET_PATH);
- final ServletResponse fresponse = response;
- final ServletRequest frequest = request;
+ final ServletResponse fresponse = response;
+ final ServletRequest frequest = request;
+ if (includeUri != null)
+ request.removeAttribute(Constants.INC_SERVLET_PATH);
+ try {
+ context.getRequestDispatcher(path).forward(request, response);
+ } finally {
if (includeUri != null)
- request.removeAttribute(Constants.INC_SERVLET_PATH);
- try {
- context.getRequestDispatcher(path).forward(request, response);
- } finally {
- if (includeUri != null)
- request.setAttribute(Constants.INC_SERVLET_PATH, includeUri);
+ request.setAttribute(Constants.INC_SERVLET_PATH, includeUri);
request.setAttribute(Constants.FORWARD_SEEN, "true");
- }
+ }
}
public BodyContent pushBody() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
