remm 2004/02/05 08:22:41
Modified: http11/src/java/org/apache/coyote/http11 Http11Protocol.java
Log:
- Fix commons-modeler deprecation warnings.
Revision Changes Path
1.50 +8 -7
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Http11Protocol.java 26 Jan 2004 19:48:43 -0000 1.49
+++ Http11Protocol.java 5 Feb 2004 16:22:40 -0000 1.50
@@ -199,7 +199,8 @@
// XXX We should be able to configure it separately
// XXX It should be possible to use a single TP
tpOname=new ObjectName(domain + ":" + "type=ThreadPool,name=http" +
ep.getPort());
- Registry.getRegistry().registerComponent(tp, tpOname, null );
+ Registry.getRegistry(null, null)
+ .registerComponent(tp, tpOname, null );
tp.setName("http" + ep.getPort());
tp.setDaemon(false);
tp.addThreadPoolListener(new MXPoolListener(this, tp));
@@ -209,8 +210,8 @@
rgOname=new ObjectName( domain +
":type=GlobalRequestProcessor,name=http" +
ep.getPort());
- Registry.getRegistry().registerComponent( cHandler.global,
- rgOname, null );
+ Registry.getRegistry(null, null).registerComponent
+ ( cHandler.global, rgOname, null );
}
try {
@@ -246,9 +247,9 @@
log.info("Stoping http11 protocol on " + ep.getPort() + " " + tpOname);
ep.stopEndpoint();
if( tpOname!=null )
- Registry.getRegistry().unregisterComponent(tpOname);
+ Registry.getRegistry(null, null).unregisterComponent(tpOname);
if( rgOname != null )
- Registry.getRegistry().unregisterComponent(rgOname);
+ Registry.getRegistry(null, null).unregisterComponent(rgOname);
}
// -------------------- Properties--------------------
@@ -643,7 +644,7 @@
}
ObjectName
oname=(ObjectName)tpData[Http11Protocol.THREAD_DATA_OBJECT_NAME];
if( oname==null ) return;
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
Http11Processor processor =
(Http11Processor) tpData[Http11Protocol.THREAD_DATA_PROCESSOR];
RequestInfo rp=processor.getRequest().getRequestProcessor();
@@ -693,7 +694,7 @@
ObjectName rpName=new ObjectName(proto.getDomain() +
":type=RequestProcessor,worker=http" +
proto.ep.getPort() +",name=HttpRequest" + count++ );
- Registry.getRegistry().registerComponent( rp, rpName, null);
+ Registry.getRegistry(null, null).registerComponent( rp, rpName,
null);
thData[Http11Protocol.THREAD_DATA_OBJECT_NAME]=rpName;
} catch( Exception ex ) {
log.warn("Error registering request");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
