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/native/common jk_map.c jk_map.h
Date Mon, 21 Feb 2005 08:25:33 GMT
mturk       2005/02/21 00:25:33

  Modified:    jk/native/common jk_map.c jk_map.h
  Log:
  Return modification time to the caller. Do not set directly to shmem
  because we can open any property file not just workers.properties.
  
  Revision  Changes    Path
  1.30      +4 -4      jakarta-tomcat-connectors/jk/native/common/jk_map.c
  
  Index: jk_map.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jk_map.c	20 Feb 2005 12:19:17 -0000	1.29
  +++ jk_map.c	21 Feb 2005 08:25:33 -0000	1.30
  @@ -400,7 +400,7 @@
   }
   
   
  -int jk_map_read_properties(jk_map_t *m, const char *f)
  +int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified)
   {
       int rc = JK_FALSE;
   
  @@ -427,8 +427,8 @@
                       break;
               }
               fclose(fp);
  -            /* Update shared memory */
  -            jk_shm_set_workers_time(statbuf.st_mtime);
  +            if (modified)
  +                *modified = statbuf.st_mtime;
           }
       }
   
  
  
  
  1.16      +2 -2      jakarta-tomcat-connectors/jk/native/common/jk_map.h
  
  Index: jk_map.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_map.h	20 Feb 2005 12:19:17 -0000	1.15
  +++ jk_map.h	21 Feb 2005 08:25:33 -0000	1.16
  @@ -61,7 +61,7 @@
   
   int jk_map_read_property(jk_map_t *m, const char *str);
   
  -int jk_map_read_properties(jk_map_t *m, const char *f);
  +int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified);
   
   int jk_map_size(jk_map_t *m);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message