remm 01/02/04 21:41:58
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java
Log:
- Comment out a printStackTrace, and redo a little bit the indenting.
Revision Changes Path
1.15 +29 -20
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApplicationContext.java 2001/02/04 00:49:41 1.14
+++ ApplicationContext.java 2001/02/05 05:41:57 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.14 2001/02/04 00:49:41 glenn Exp $
- * $Revision: 1.14 $
- * $Date: 2001/02/04 00:49:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.15 2001/02/05 05:41:57 remm Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/02/05 05:41:57 $
*
* ====================================================================
*
@@ -111,24 +111,26 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.14 $ $Date: 2001/02/04 00:49:41 $
+ * @version $Revision: 1.15 $ $Date: 2001/02/05 05:41:57 $
*/
public final class ApplicationContext
implements ServletContext {
- protected class PrivilegedGetRequestDispatcher implements PrivilegedAction {
+
+ protected class PrivilegedGetRequestDispatcher
+ implements PrivilegedAction {
+
private String contextPath;
private String relativeURI;
private String queryString;
PrivilegedGetRequestDispatcher(String contextPath, String relativeURI,
- String queryString)
- {
+ String queryString) {
this.contextPath = contextPath;
this.relativeURI = relativeURI;
this.queryString = queryString;
- }
+ }
public Object run() {
HttpRequestBase request = new HttpRequestBase();
@@ -141,31 +143,38 @@
return (null);
// Construct a RequestDispatcher to process this request
- HttpServletRequest hrequest = (HttpServletRequest) request.getRequest();
- return (RequestDispatcher) new ApplicationDispatcher(wrapper,
- hrequest.getServletPath(),
- hrequest.getPathInfo(),
- hrequest.getQueryString(),
- null);
- }
+ HttpServletRequest hrequest =
+ (HttpServletRequest) request.getRequest();
+ return (RequestDispatcher) new ApplicationDispatcher
+ (wrapper,
+ hrequest.getServletPath(),
+ hrequest.getPathInfo(),
+ hrequest.getQueryString(),
+ null);
+ }
+
}
- protected class PrivilegedGetResource implements PrivilegedExceptionAction {
+
+ protected class PrivilegedGetResource
+ implements PrivilegedExceptionAction {
+
private String path;
private DirContext resources;
- PrivilegedGetResource(String path, DirContext resources)
- {
+ PrivilegedGetResource(String path, DirContext resources) {
this.path = path;
this.resources = resources;
}
-
+
public Object run() throws Exception {
return new URL("jndi", null, 0, path,
new DirContextURLStreamHandler(resources));
}
+
}
+
// ----------------------------------------------------------- Constructors
@@ -506,7 +515,7 @@
new DirContextURLStreamHandler(resources));
}
} catch (Exception e) {
- e.printStackTrace();
+ //e.printStackTrace();
}
}
return (null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
