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/server/isapi jk_isapi_plugin.c
Date Sun, 14 Jul 2002 13:39:13 GMT
mturk       2002/07/14 06:39:13

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Remove the hack for unloading the jvm. Now its done on the Java side.
  Check for threadPool config value to be at least 10 or higher.
  
  Revision  Changes    Path
  1.39      +9 -8      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- jk_isapi_plugin.c	10 Jul 2002 17:36:09 -0000	1.38
  +++ jk_isapi_plugin.c	14 Jul 2002 13:39:13 -0000	1.39
  @@ -562,6 +562,7 @@
       SetEvent(jk2_starter_event);
       WaitForSingleObject(jk2_starter_thread, 3000);
       CloseHandle(jk2_starter_thread);
  +    jk2_starter_thread = INVALID_HANDLE_VALUE;
       return TRUE;
   }
   
  @@ -577,13 +578,6 @@
       char fname[_MAX_FNAME];
   
       switch (ulReason) {
  -        case DLL_PROCESS_DETACH:
  -            /* Dirty hack to unload the jvm */
  -            if (was_inited && jk_jni_status_code) {
  -                ExitProcess(0);
  -            }
  -      break;
  -
           case DLL_PROCESS_ATTACH:
               if (GetModuleFileName( hInst, file_name, sizeof(file_name))) {
                   _splitpath( file_name, drive, dir, fname, NULL );
  @@ -667,6 +661,8 @@
               tmp = map->get(env,map,THREAD_POOL_TAG);
               if (tmp) {
                   use_thread_pool = atoi(tmp);
  +                if (use_thread_pool < 10)
  +                    use_thread_pool = 0;
               }
               tmp = map->get(env,map,USE_AUTH_COMP_TAG);
               if (tmp) {
  @@ -720,6 +716,11 @@
                                        tmpbuf,
                                        8)) {
           use_thread_pool = atoi(tmpbuf);
  +        if (use_thread_pool < 10) {
  +            use_thread_pool = 0;
  +            env->l->jkLog(env, env->l, JK_LOG_INFO, 
  +                          "read_registry_init_data, ThreadPool must be set to the value
10 or higher\n");
  +        }
       }
       if(get_registry_config_parameter(hkey,
                                        USE_AUTH_COMP_TAG,
  
  
  

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