[svn-commits] tilghman: branch 1.6.0 r160560 - in /branches/1.6.0: ./ pbx/pbx_spool.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec  3 11:41:07 2008
New Revision: 160560

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160560
Log:
Merged revisions 160559 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160559 | tilghman | 2008-12-03 11:38:59 -0600 (Wed, 03 Dec 2008) | 14 lines
  
  Merged revisions 160558 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160558 | tilghman | 2008-12-03 11:34:34 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    If an entry is added to the directory during a scan when another entry expires,
    then that new entry will not be processed promptly, but must wait for either a
    future entry to start or a current entry's retry to occur.  If no other entries
    exist in the directory (other than the new entries) when a bunch expire, then
    the new entries must wait until another new entry is added to be processed.
    This was a rather weird race condition, really.  Fixes AST-147.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/pbx/pbx_spool.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/pbx/pbx_spool.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_spool.c?view=diff&rev=160560&r1=160559&r2=160560
==============================================================================
--- branches/1.6.0/pbx/pbx_spool.c (original)
+++ branches/1.6.0/pbx/pbx_spool.c Wed Dec  3 11:41:07 2008
@@ -465,7 +465,7 @@
 #if 0
 		printf("atime: %ld, mtime: %ld, ctime: %ld\n", st.st_atime, st.st_mtime, st.st_ctime);
 		printf("Ooh, something changed / timeout\n");
-#endif				
+#endif
 		next = 0;
 		last = st.st_mtime;
 
@@ -489,8 +489,12 @@
 					if (!next || (res < next)) {
 						next = res;
 					}
-				} else if (res)
+				} else if (res) {
 					ast_log(LOG_WARNING, "Failed to scan service '%s'\n", fn);
+				} else if (!next) {
+					/* Expired entry: must recheck on the next go-around */
+					next = st.st_mtime;
+				}
 			} else {
 				/* Update "next" update if necessary */
 				if (!next || (st.st_mtime < next))