--- projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/JobControlManager.java	2014-05-23 01:16:56 UTC (rev 3140)
+++ projects/lcsim/trunk/job-manager/src/main/java/org/lcsim/job/JobControlManager.java	2014-05-23 02:19:11 UTC (rev 3141)
@@ -111,7 +111,7 @@

     private boolean performDryRun;
     private boolean rewrite;
     private boolean useSteeringResource;

-    private boolean headless;

+    //private boolean headless;

 
     // Settings effecting logging verbosity.
     private boolean printInputFiles;

@@ -1203,7 +1203,8 @@

         // }
         // Running in batch.
         // else {

-        loader = new LCSimClassLoader(urls);

+        if (loader == null)
+            loader = new LCSimClassLoader(urls);

         // }
 
         // Print user classpath entries.

@@ -1413,6 +1414,13 @@

     public void setPerformDryRun(boolean d) {
         this.performDryRun = d;
     }

+    
+    public void setClassLoader(ClassLoader loader) {
+        if (loader == null)
+            throw new IllegalArgumentException("The ClassLoader argument points to null.");
+        this.loader = loader;
+        logStream.println("Set ClassLoader to " + loader.getClass().getCanonicalName());
+    }

 
     private void checkConditions() {