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

[mturk]

mturk       2005/02/12 11:27:43

  Modified:    jk/native/common jk_worker.c
  Log:
  Initialize worker mount list if present inside config.
  
  Revision  Changes    Path
  1.28      +21 -1     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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_worker.c       6 Feb 2005 13:30:34 -0000       1.27
  +++ jk_worker.c       12 Feb 2005 19:27:43 -0000      1.28
  @@ -106,6 +106,8 @@
           const char *type = jk_get_worker_type(init_data, name);
           worker_factory fac = get_factory_for(type);
           jk_worker_t *w = NULL;
  +        unsigned int i, num_of_maps;
  +        char **map_names;
   
           *rc = NULL;
   
  @@ -147,6 +149,24 @@
               JK_TRACE_EXIT(l);
               return JK_FALSE;
           }
  +        if (jk_get_worker_mount_list(init_data, name,
  +                                     &map_names,
  +                                     &num_of_maps) && num_of_maps) {
  +            for (i = 0; i < num_of_maps; i++) {
  +                if (JK_IS_DEBUG_LEVEL(l))
  +                    jk_log(l, JK_LOG_DEBUG,
  +                            "mounting %s to worker %s",
  +                            map_names[i], name);
  +                if (uri_worker_map_add(we->uri_to_worker, map_names[i],
  +                                       name, l) == JK_FALSE) {
  +                    w->destroy(&w, l);
  +                    jk_log(l, JK_LOG_ERROR,
  +                           "validate failed for %s", name);
  +                    JK_TRACE_EXIT(l);
  +                    return JK_FALSE;
  +                }
  +            }
  +        }
   
           *rc = w;
           JK_TRACE_EXIT(l);
  
  
  

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