costin 2003/01/27 21:42:24
Modified: jk/java/org/apache/jk/common ChannelSocket.java
HandlerRequest.java
Log:
Fix the name of the jk handler.
Fix a NPE - req must be created first.
Revision Changes Path
1.33 +1 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChannelSocket.java 20 Jan 2003 19:20:32 -0000 1.32
+++ ChannelSocket.java 28 Jan 2003 05:42:24 -0000 1.33
@@ -360,7 +360,7 @@
if( this.domain != null ) {
try {
Registry.getRegistry().registerComponent(tp, domain,"ThreadPool",
- "type=ThreadPool,worker=jk,name=" + getAddress() + "%" +
port);
+ "type=ThreadPool,worker=jk,name=Jk" + port);
} catch (Exception e) {
log.error("Can't register threadpool" );
}
1.23 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- HandlerRequest.java 20 Jan 2003 23:48:40 -0000 1.22
+++ HandlerRequest.java 28 Jan 2003 05:42:24 -0000 1.23
@@ -418,7 +418,6 @@
{
// FORWARD_REQUEST handler
Request req=(Request)ep.getRequest();
- req.setStartTime(System.currentTimeMillis());
if( req==null ) {
req=new Request();
Response res=new Response();
@@ -444,6 +443,7 @@
}
}
+ req.setStartTime(System.currentTimeMillis());
JkInputStream jkBody=(JkInputStream)ep.getNote( bodyNote );
if( jkBody==null ) {
jkBody=new JkInputStream();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
