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

[mturk]

mturk       2004/11/19 05:00:43

  Modified:    jk/native/common jk_util.c
  Log:
  Assure that the number of retries is at least one.
  
  Revision  Changes    Path
  1.39      +7 -3      jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- jk_util.c 12 Nov 2004 18:45:24 -0000      1.38
  +++ jk_util.c 19 Nov 2004 13:00:43 -0000      1.39
  @@ -526,7 +526,7 @@
   int jk_get_worker_retries(jk_map_t *m, const char *wname, int def)
   {
       char buf[1024];
  -
  +    int rv;
       if (!m || !wname) {
           return -1;
       }
  @@ -534,7 +534,11 @@
       sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
               RETRIES_OF_WORKER);
   
  -    return jk_map_get_int(m, buf, def);
  +    rv = jk_map_get_int(m, buf, def);
  +    if (rv < 1)
  +        rv = 1;
  +
  +    return rv;        
   }
   
   int jk_get_worker_recovery_opts(jk_map_t *m, const char *wname, int def)
  
  
  

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