costin 2003/01/20 15:48:40
Modified: jk/java/org/apache/jk/common HandlerRequest.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
JkMain.java
Log:
Few updates for RequestInfo.
Revision Changes Path
1.22 +13 -2
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- HandlerRequest.java 16 Jan 2003 22:13:37 -0000 1.21
+++ HandlerRequest.java 20 Jan 2003 23:48:40 -0000 1.22
@@ -411,22 +411,33 @@
}
static int count=0;
+ RequestGroupInfo global=null;
private int decodeRequest( Msg msg, MsgContext ep, MessageBytes tmpMB )
throws IOException
{
// FORWARD_REQUEST handler
Request req=(Request)ep.getRequest();
+ req.setStartTime(System.currentTimeMillis());
if( req==null ) {
req=new Request();
Response res=new Response();
req.setResponse(res);
ep.setRequest( req );
- RequestProcessor rp=new RequestProcessor(req);
if( this.getDomain() != null ) {
try {
+ if( global==null ) {
+ global=new RequestGroupInfo();
+ Registry.getRegistry().registerComponent( global,
+ getDomain(), "GlobalRequestProcessor",
+ "type=GlobalRequestProcessor,name=jk");
+ }
+
+ RequestInfo rp=req.getRequestProcessor();
+ rp.setGlobalProcessor(global);
Registry.getRegistry().registerComponent( rp,
- getDomain(), "RequestProcessor", "name=Request" +
count++ );
+ getDomain(), "RequestProcessor",
+ "type=RequestProcessor,name=JkRequest" + count++ );
} catch( Exception ex ) {
log.warn("Error registering request");
}
1.35 +1 -1
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JkCoyoteHandler.java 20 Jan 2003 19:20:32 -0000 1.34
+++ JkCoyoteHandler.java 20 Jan 2003 23:48:40 -0000 1.35
@@ -456,7 +456,7 @@
{
// XXX Can we have multiple JkMain ?
Registry.getRegistry().registerComponent(jkMain, name.getDomain(),
- "JkMain", "name=JkMain");
+ "JkMain", "type=JkHandler,name=JkMain");
return super.preRegister(server, name);
}
}
1.34 +4 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JkMain.java 16 Jan 2003 22:17:37 -0000 1.33
+++ JkMain.java 20 Jan 2003 23:48:40 -0000 1.34
@@ -513,6 +513,9 @@
String fullName=name;
String localName="";
String propName="";
+ // ignore
+ if( name.startsWith("key.")) return;
+
int dot=name.indexOf(".");
int lastDot=name.lastIndexOf(".");
if( dot > 0 ) {
@@ -564,7 +567,7 @@
}
if( this.domain != null ) {
try {
- Registry.getRegistry().registerComponent(handler, this.domain,
"JkHandler",
+ Registry.getRegistry().registerComponent(handler, this.domain,
classN,
"type=JkHandler,name=" + fullName);
} catch (Exception e) {
log.error( "Error registering " + fullName, e );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
