remm 02/02/20 17:57:30
Modified: catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpProcessor.java
Log:
- Port the addition of try/catch to make the main processing code more robust.
Unexpected exceptions will be logged.
Revision Changes Path
No revision
No revision
1.36.2.3 +11 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -u -r1.36.2.2 -r1.36.2.3
--- HttpProcessor.java 3 Nov 2001 02:24:18 -0000 1.36.2.2
+++ HttpProcessor.java 21 Feb 2002 01:57:30 -0000 1.36.2.3
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.2 2001/11/03 02:24:18 remm Exp $
- * $Revision: 1.36.2.2 $
- * $Date: 2001/11/03 02:24:18 $
+/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.3 2002/02/21 01:57:30 remm Exp $
+ * $Revision: 1.36.2.3 $
+ * $Date: 2002/02/21 01:57:30 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.36.2.2 $ $Date: 2001/11/03 02:24:18 $
+ * @version $Revision: 1.36.2.3 $ $Date: 2002/02/21 01:57:30 $
*/
final class HttpProcessor
@@ -1043,6 +1043,8 @@
}
} catch (IOException e) {
ok = false;
+ } catch (Exception e) {
+ log("process.finish", e);
}
// We have to check if the connection closure has been requested
@@ -1104,7 +1106,11 @@
continue;
// Process the request from this socket
- process(socket);
+ try {
+ process(socket);
+ } catch (Throwable t) {
+ log("process", t);
+ }
// Finish up this request
connector.recycle(this);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
