billbarker 2004/03/21 15:50:54
Modified: jk/java/org/apache/jk/common ChannelSocket.java
Log:
Fix exception when attempting to pause the channel w/o specifying an address.
Also fix problem where requests weren't being unregistered because of a misformatted
Msg.
Revision Changes Path
1.45 +4 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChannelSocket.java 24 Feb 2004 08:48:42 -0000 1.44
+++ ChannelSocket.java 21 Mar 2004 23:50:53 -0000 1.45
@@ -415,7 +415,8 @@
private void unLockSocket() throws IOException {
// Need to create a connection to unlock the accept();
Socket s;
- if (inet == null) {
+
+ if (inet == null || "0.0.0.0".equals(inet.getHostAddress())) {
s=new Socket("127.0.0.1", port );
}else{
s=new Socket(inet, port );
@@ -653,6 +654,8 @@
MsgAjp endM = new MsgAjp();
endM.reset();
endM.appendByte((byte)HANDLE_THREAD_END);
+ endM.end();
+ endM.processHeader();
next.invoke(endM, ep);
} catch( Exception ee) {
log.error( "Error, releasing connection",ee);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
