lcsim/src/org/lcsim/job

diff -u -r1.59 -r1.60
--- JobControlManager.java	17 May 2012 00:14:05 -0000	1.59
+++ JobControlManager.java	17 May 2012 01:11:58 -0000	1.60
@@ -83,7 +83,7 @@

  * which it should be discarded.  If the {@link #run()} method is called twice on 
  * the same manager, a fatal exception will be thrown.
  *   

- * @version $Id: JobControlManager.java,v 1.59 2012/05/17 00:14:05 jeremy Exp $

+ * @version $Id: JobControlManager.java,v 1.60 2012/05/17 01:11:58 jeremy Exp $

  * @author Jeremy McCormick
  */
 // TODO: Do proper logging using Java Logger class.

@@ -1454,18 +1454,19 @@

         }
         
         logStream.println("Adding ConditionsCheckDriver to front of Driver exec list.");

-        ConditionsCheckDriver d = createConditionsCheckDriver();        
-        if (detectorsElement == null) {
-            // No detector names provided, so individual detectors will have all conditions checked.   
-            d.setCheckDetector(false);
-            d.setCheckConditions(true);
-        } else {
-            // Detectors already checked by name so just check that detector names in the job are okay.
-            d.setCheckConditions(false);
-            d.setCheckDetector(true);
-        }
-        if (d != null)

+        ConditionsCheckDriver d = createConditionsCheckDriver();
+        if (d != null) {
+            if (detectorsElement == null) {
+                // No detector names provided, so individual detectors will have all conditions checked.   
+                d.setCheckDetector(false);
+                d.setCheckConditions(true);
+            } else {
+                // Detectors already checked by name so just check that detector names in the job are okay.
+                d.setCheckConditions(false);
+                d.setCheckDetector(true);
+            }

             driverExec.add(d);

+        }

     }
     
     private ConditionsCheckDriver createConditionsCheckDriver() {