You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/04/09 06:20:58 UTC

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/core JkHandler.java

costin      2003/04/08 21:20:58

  Modified:    jk/java/org/apache/jk/core JkHandler.java
  Log:
  Make sure WorkerEnv is set correctly and we register with it.
  
  Revision  Changes    Path
  1.11      +20 -4     jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java
  
  Index: JkHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JkHandler.java	16 Jan 2003 22:15:05 -0000	1.10
  +++ JkHandler.java	9 Apr 2003 04:20:58 -0000	1.11
  @@ -66,6 +66,7 @@
   import javax.management.ObjectName;
   import javax.management.MBeanServer;
   import javax.management.NotificationListener;
  +import org.apache.commons.modeler.Registry;
   
   /**
    *
  @@ -194,11 +195,26 @@
       }
   
       public ObjectName preRegister(MBeanServer server,
  -                                  ObjectName name) throws Exception {
  -        oname=name;
  +                                  ObjectName oname) throws Exception {
  +        this.oname=oname;
           mserver=server;
  -        domain=name.getDomain();
  -        return name;
  +        domain=oname.getDomain();
  +        name=oname.getKeyProperty("name");
  +        
  +        // we need to create a workerEnv or set one.
  +        if ( wEnv == null ) {
  +            ObjectName wEnvName=new ObjectName(domain + ":type=Jk2WorkerEnv");
  +            if( ! mserver.isRegistered(wEnvName )) {
  +                wEnv=new WorkerEnv();
  +                Registry.getRegistry().registerComponent(wEnv, wEnvName, null);
  +            }
  +            mserver.invoke( wEnvName, "addHandler", 
  +                    new Object[] {name, this}, 
  +                    new String[] {"java.lang.String", 
  +                                  "org.apache.jk.core.JkHandler"});
  +        }
  +        
  +        return oname;
       }
   
       public void postRegister(Boolean registrationDone) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org