tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
Date Sat, 29 Jun 2002 18:31:01 GMT
mturk       2002/06/29 11:31:01

  Modified:    jk/native2/common jk_channel_jni.c
  Log:
  Make default 60 second initialization.
  
  Revision  Changes    Path
  1.30      +7 -8      jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
  
  Index: jk_channel_jni.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jk_channel_jni.c	29 Jun 2002 07:51:20 -0000	1.29
  +++ jk_channel_jni.c	29 Jun 2002 18:31:00 -0000	1.30
  @@ -93,7 +93,6 @@
   
       jmethodID writeMethod;
       int status;
  -    int wait_initialized;
   } jk_channel_jni_private_t;
   
   typedef struct {
  @@ -119,8 +118,10 @@
       if( wEnv->vm == NULL ) {
           env->l->jkLog(env, env->l, JK_LOG_INFO,
                         "channel_jni.init() no VM found\n" );
  -        if( jniW->worker != NULL )
  +        if( jniW->worker != NULL ) {
               jniW->worker->mbean->disabled=JK_TRUE;
  +            jniW->worker->mbean->initialize=60;
  +        }
           return JK_ERR;
       }
       return JK_OK;
  @@ -541,10 +542,6 @@
       if( strcmp( "class", name ) == 0 ) {
           jniInfo->className=value;
       }
  -    else if( strcmp( "init", name ) == 0 ) {
  -        jniInfo->wait_initialized=atoi(value);
  -    }
  -
       /* TODO: apache protocol hooks
       else if( strcmp( "xxxx", name ) == 0 ) {
           jniInfo->xxxx=value;
  @@ -579,11 +576,12 @@
   }
   
   static int JK_METHOD jk2_channel_jni_status(jk_env_t *env,
  +                                            struct jk_worker *worker,
                                               jk_channel_t *_this)
   {
   
       jk_channel_jni_private_t *jniCh=_this->_privatePtr;
  -    if ( jniCh->status != JNI_TOMCAT_STARTED && jniCh->wait_initialized)
{
  +    if ( jniCh->status != JNI_TOMCAT_STARTED && worker->mbean->initialize)
{
           jniCh->status = jk_jni_status_code;
           if (jniCh->status != JNI_TOMCAT_STARTED)
               return JK_ERR;
  @@ -628,7 +626,8 @@
       wEnv->addChannel( env, wEnv, ch );
   
       result->invoke=jk2_channel_jni_invoke;
  -    
  +    ch->worker->mbean->initialize = 60;
  +
       return JK_OK;
   }
   
  
  
  

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


Mime
View raw message