billbarker 2004/01/15 19:14:11
Modified: jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Fix JMX self-registration when loading the "normal" way.
Revision Changes Path
1.48 +8 -8
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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- JkCoyoteHandler.java 7 Jan 2004 05:32:44 -0000 1.47
+++ JkCoyoteHandler.java 16 Jan 2004 03:14:11 -0000 1.48
@@ -182,14 +182,6 @@
jkMain=new JkMain();
jkMain.setWorkerEnv(wEnv);
- if( oname != null ) {
- try {
- Registry.getRegistry().registerComponent(jkMain,
oname.getDomain(),
- "JkMain", "type=JkMain");
- } catch (Exception e) {
- log.error( "Error registering jkmain " + e );
- }
- }
}
return jkMain;
}
@@ -229,6 +221,14 @@
public void start() {
try {
+ if( oname != null && getJkMain().getDomain() == null) {
+ try {
+ Registry.getRegistry().registerComponent(getJkMain(),
oname.getDomain(),
+ "JkMain", "type=JkMain");
+ } catch (Exception e) {
+ log.error( "Error registering jkmain " + e );
+ }
+ }
getJkMain().start();
} catch( Exception ex ) {
ex.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
