billbarker 2004/03/24 19:01:21
Modified: jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Make certain that the endpoint is closed, even if Apache has already dropped the
connection.
IOExceptions here are pretty harmless, since they mean that Apache has already
finished with the page, and so doesn't need to be told that the page is done.
Fix for Bug #27917.
Revision Changes Path
1.53 +12 -9
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- JkCoyoteHandler.java 24 Feb 2004 08:48:41 -0000 1.52
+++ JkCoyoteHandler.java 25 Mar 2004 03:01:21 -0000 1.53
@@ -173,7 +173,7 @@
"jkInputStream");
} catch( Exception ex ) {
- ex.printStackTrace();
+ log.error("Error during init",ex);
}
}
@@ -189,7 +189,7 @@
}
getJkMain().start();
} catch( Exception ex ) {
- ex.printStackTrace();
+ log.error("Error during startup",ex);
}
}
@@ -295,7 +295,7 @@
try {
adapter.service( req, res );
} catch( Exception ex ) {
- ex.printStackTrace();
+ log.info("Error servicing request " + req,ex);
}
if(ep.getStatus() != JK_STATUS_CLOSED) {
res.finish();
@@ -439,13 +439,16 @@
msg.reset();
msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE );
msg.appendByte( 1 );
-
- ep.setType( JkHandler.HANDLE_SEND_PACKET );
- ep.getSource().invoke( msg, ep );
-
- ep.setType( JkHandler.HANDLE_FLUSH );
- ep.getSource().invoke( msg, ep );
+ try {
+ ep.setType( JkHandler.HANDLE_SEND_PACKET );
+ ep.getSource().invoke( msg, ep );
+
+ ep.setType( JkHandler.HANDLE_FLUSH );
+ ep.getSource().invoke( msg, ep );
+ } catch(IOException iex) {
+ log.debug("Connection error ending request.",iex);
+ }
ep.setStatus(JK_STATUS_CLOSED );
if( logTime.isDebugEnabled() )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
