[Swift-commit] r7922 - trunk/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-06-13 21:57:18 -0500 (Fri, 13 Jun 2014)
New Revision: 7922

Modified:
   trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
Log:
port of NPE missing tc.data app fix from 0.95

Modified: trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2014-06-14 02:54:53 UTC (rev 7921)
+++ trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2014-06-14 02:57:18 UTC (rev 7922)
@@ -41,6 +41,7 @@
 import org.globus.cog.abstraction.interfaces.StatusListener;
 import org.globus.cog.abstraction.interfaces.Task;
 import org.globus.cog.karajan.scheduler.AbstractScheduler;
+import org.globus.cog.karajan.scheduler.ContactAllocationTask;
 import org.globus.cog.karajan.scheduler.ResourceConstraintChecker;
 import org.globus.cog.karajan.scheduler.TaskConstraints;
 import org.globus.cog.karajan.scheduler.WeightedHostScoreScheduler;
@@ -396,8 +397,10 @@
 		}
 		Task t = e.task;
 		List<Entry> cluster = null;
-		synchronized (tasks) {
-			cluster = tasks.get(t);
+		if (!(t instanceof ContactAllocationTask)) {
+    		synchronized (tasks) {
+    			cluster = tasks.get(t);
+    		}
 		}
 		if (cluster != null) {
 		    for (Entry e1 : cluster) {