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 Sun, 14 Jul 2002 13:36:03 GMT
mturk       2002/07/14 06:36:03

  Modified:    jk/native2/common jk_channel_jni.c
  Log:
  Remove the jvm detaching from channel ajp to the service.
  
  Revision  Changes    Path
  1.33      +7 -3      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- jk_channel_jni.c	8 Jul 2002 13:41:46 -0000	1.32
  +++ jk_channel_jni.c	14 Jul 2002 13:36:03 -0000	1.33
  @@ -522,11 +522,15 @@
   {
       jk_workerEnv_t *we=worker->workerEnv;
   
  -    /* XXX Don't detach if worker is reused per thread */
  -    if( we==NULL || we->vm==NULL ) {
  +    if( we==NULL || we->vm==NULL) {
           return JK_OK;
       }
  -    we->vm->detach( env, we->vm );
  +    /* 
  +     * In case of not having the endpoint detach the jvm.
  +     * XXX Remove calling this function from ajp13 worker?
  +     */
  +    if (endpoint == NULL)
  +        we->vm->detach( env, we->vm );
       if( worker->mbean->debug > 0 )
           env->l->jkLog(env, env->l, JK_LOG_DEBUG, 
                         "channelJni.afterRequest() ok\n");
  
  
  

--
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