The scheduler now reads the spool directory if one or more job cache entries

point to deleted jobs (<rdar://problem/24048846>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13120 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index df0d6a566863e73538df4845f8ac119d6789e5ee..32a2dcd9346f87253004b5f2af49065b007d26d7 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ CHANGES.txt - 2.2b1 - 2016-03-07
 
 CHANGES IN CUPS V2.2b1
 
+       - The scheduler now reads the spool directory if one or more job cache
+         entries point to deleted jobs (<rdar://problem/24048846>)
        - Added support for disc media sizes (<rdar://problem/20219536>)
        - The httpAddrConnect and httpConnect* APIs now try connecting to
          multiple addresses in parallel (<rdar://problem/20643153>)

diff --git a/scheduler/job.c b/scheduler/job.c
index de40bae59da319b8c04d74c62a0cc69b7323027e..b18c7ee199315a76dcb58246c028d982a9b23108 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -4135,7 +4135,15 @@ load_job_cache(const char *filename)     /* I - job.cache filename */
        {
          cupsdLogMessage(CUPSD_LOG_ERROR, "[Job %d] Files have gone away.",
                          jobid);
-         continue;
+
+         /*
+          * job.cache file is out-of-date compared to spool directory; load
+          * that instead...
+          */
+
+         cupsFileClose(fp);
+          load_request_root();
+          return;
        }
       }