The scheduler did not handle out-of-disk situations gracefully (Issue #4742)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4a61f266b3fdd3add2b27b235b95b23241f92f67..17008029463c39f871d9d9586261293581a6e1fa 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,8 @@ CHANGES.txt - 2.2b1 - 2016-03-30
 
 CHANGES IN CUPS V2.2b1
 
-       - Documentation changes (Issue #4781)
+       - The scheduler did not handle out-of-disk situations gracefully
+         (Issue #4742)
        - The LPD mini-daemon now detects invalid UTF-8 sequences in job,
          document, and user names (Issue #4748)
        - The IPP backend now continues on to the next job when the remote
@@ -23,3 +24,4 @@ CHANGES IN CUPS V2.2b1
          (<rdar://problem/23135640>)
        - Added a new cupsHashData API and support for hashed job passwords
          (<rdar://problem/20221502>)
+       - Documentation changes (Issue #4781)

diff --git a/scheduler/job.c b/scheduler/job.c
index b18c7ee199315a76dcb58246c028d982a9b23108..784490e089c934aa320a77c73cf37d2c4181e5d3 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,9 +1,7 @@
 /*
- * "$Id$"
- *
  * Job management routines for the CUPS scheduler.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -2808,7 +2806,8 @@ cupsdUnloadCompletedJobs(void)
       if (job->dirty)
         cupsdSaveJob(job);
 
-      unload_job(job);
+      if (!job->dirty)
+        unload_job(job);
     }
 }
 
@@ -5368,8 +5367,3 @@ update_job_attrs(cupsd_job_t *job,        /* I - Job to update */
   job->dirty = 1;
   cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 }
-
-
-/*
- * End of "$Id$".
- */