You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/06/23 02:58:54 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core ApplicationDispatcher.java StandardContextValve.java StandardEngineValve.java StandardHostValve.java StandardWrapperValve.java
craigmcc 00/06/22 17:58:53
Modified: proposals/catalina/src/share/org/apache/tomcat/core
ApplicationDispatcher.java
StandardContextValve.java StandardEngineValve.java
StandardHostValve.java StandardWrapperValve.java
Log:
Clean up several FIXME comments that really represent environmental notes,
rather than unfinished code that needs to be fixed.
Revision Changes Path
1.7 +4 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/ApplicationDispatcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationDispatcher.java 2000/06/22 00:19:08 1.6
+++ ApplicationDispatcher.java 2000/06/23 00:58:47 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/ApplicationDispatcher.java,v 1.6 2000/06/22 00:19:08 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/06/22 00:19:08 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/ApplicationDispatcher.java,v 1.7 2000/06/23 00:58:47 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/06/23 00:58:47 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* from this resource.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/06/22 00:19:08 $
+ * @version $Revision: 1.7 $ $Date: 2000/06/23 00:58:47 $
*/
final class ApplicationDispatcher
@@ -202,7 +202,6 @@
((Response) response).resetBuffer();
// Cast the servlet request and response to our internal objects
- // FIXME - Depends on internal objects not being separated
Request srequest = (Request) request;
Response sresponse = (Response) response;
HttpRequest hrequest = null;
@@ -330,7 +329,6 @@
response.flushBuffer();
// Cast the servlet request and response to our internal objects
- // FIXME - Depends on internal objects not being separated
Request srequest = (Request) request;
Response sresponse = (Response) response;
HttpRequest hrequest = null;
1.7 +5 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContextValve.java
Index: StandardContextValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContextValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardContextValve.java 2000/05/22 20:11:12 1.6
+++ StandardContextValve.java 2000/06/23 00:58:48 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContextValve.java,v 1.6 2000/05/22 20:11:12 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/05/22 20:11:12 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContextValve.java,v 1.7 2000/06/23 00:58:48 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/06/23 00:58:48 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/05/22 20:11:12 $
+ * @version $Revision: 1.7 $ $Date: 2000/06/23 00:58:48 $
*/
final class StandardContextValve
@@ -122,7 +122,7 @@
// Validate the request and response object types
if (!(request.getRequest() instanceof HttpServletRequest) ||
!(response.getResponse() instanceof HttpServletResponse)) {
- return; // FIXME - Not much else we can do generically
+ return; // NOTE - Not much else we can do generically
}
// Select the Wrapper to be used for this Request
1.7 +5 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardEngineValve.java
Index: StandardEngineValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardEngineValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardEngineValve.java 2000/05/22 20:11:13 1.6
+++ StandardEngineValve.java 2000/06/23 00:58:49 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardEngineValve.java,v 1.6 2000/05/22 20:11:13 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/05/22 20:11:13 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardEngineValve.java,v 1.7 2000/06/23 00:58:49 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/06/23 00:58:49 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/05/22 20:11:13 $
+ * @version $Revision: 1.7 $ $Date: 2000/06/23 00:58:49 $
*/
final class StandardEngineValve
@@ -122,7 +122,7 @@
// Validate the request and response object types
if (!(request.getRequest() instanceof HttpServletRequest) ||
!(response.getResponse() instanceof HttpServletResponse)) {
- return; // FIXME - Not much else we can do generically
+ return; // NOTE - Not much else we can do generically
}
// Select the Host to be used for this Request
1.6 +5 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardHostValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardHostValve.java 2000/05/22 20:11:15 1.5
+++ StandardHostValve.java 2000/06/23 00:58:49 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardHostValve.java,v 1.5 2000/05/22 20:11:15 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/05/22 20:11:15 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardHostValve.java,v 1.6 2000/06/23 00:58:49 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/06/23 00:58:49 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/05/22 20:11:15 $
+ * @version $Revision: 1.6 $ $Date: 2000/06/23 00:58:49 $
*/
final class StandardHostValve
@@ -122,7 +122,7 @@
// Validate the request and response object types
if (!(request.getRequest() instanceof HttpServletRequest) ||
!(response.getResponse() instanceof HttpServletResponse)) {
- return; // FIXME - Not much else we can do generically
+ return; // NOTE - Not much else we can do generically
}
// Select the Context to be used for this Request
1.14 +5 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardWrapperValve.java 2000/06/20 00:44:14 1.13
+++ StandardWrapperValve.java 2000/06/23 00:58:49 1.14
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v 1.13 2000/06/20 00:44:14 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2000/06/20 00:44:14 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapperValve.java,v 1.14 2000/06/23 00:58:49 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2000/06/23 00:58:49 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* <code>StandardWrapper</code> container implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.13 $ $Date: 2000/06/20 00:44:14 $
+ * @version $Revision: 1.14 $ $Date: 2000/06/23 00:58:49 $
*/
final class StandardWrapperValve
@@ -143,7 +143,7 @@
log(sm.getString("standardWrapper.isUnavailable",
wrapper.getName()));
if (hres == null) {
- ; // FIXME - Not much we can do generically
+ ; // NOTE - Not much we can do generically
} else {
long available = wrapper.getAvailable();
if ((available > 0L) && (available < Long.MAX_VALUE))