cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c

[mturk]

mturk       2005/02/13 04:20:01

  Modified:    jk/native/common jk_worker.c
  Log:
  Use worker_env worker list.
  
  Revision  Changes    Path
  1.29      +9 -7      jakarta-tomcat-connectors/jk/native/common/jk_worker.c
  
  Index: jk_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_worker.c       12 Feb 2005 19:27:43 -0000      1.28
  +++ jk_worker.c       13 Feb 2005 12:20:01 -0000      1.29
  @@ -40,8 +40,6 @@
   
   int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l)
   {
  -    char **worker_list = NULL;
  -    unsigned num_of_workers = 0;
   
       JK_TRACE_ENTER(l);
   
  @@ -50,19 +48,23 @@
           return JK_FALSE;
       }
   
  -    if (!jk_get_worker_list(init_data, &worker_list, &num_of_workers)) {
  +    if (!jk_get_worker_list(init_data, &(we->worker_list),
  +                            &we->num_of_workers)) {
           JK_TRACE_EXIT(l);
  +        we->num_of_workers = 0;
  +        we->worker_list = NULL;
           return JK_FALSE;
       }
   
  -    if (!build_worker_map(init_data, worker_list, num_of_workers, we, l)) {
  +    if (!build_worker_map(init_data, we->worker_list,
  +                          we->num_of_workers, we, l)) {
           close_workers(l);
  +        we->num_of_workers = 0;
  +        we->worker_list = NULL;
           JK_TRACE_EXIT(l);
           return JK_FALSE;
       }
   
  -    we->num_of_workers = num_of_workers;
  -    we->first_worker = worker_list[0];
       JK_TRACE_EXIT(l);
       return JK_TRUE;
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]