Changeset 1362 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

Timestamp:

06/03/14 15:12:11 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -21 +21 @@
 
 public class JobRegistryImpl extends AbstractJobRegistry {
-        
-        private static final long serialVersionUID = 8030555906990767342L;
 
         private static Log log = LogFactory.getLog(JobRegistryImpl.class);
@@ -55 +53 @@
                         for (ExecTask task: executables) {
                                 if (task.getStatus() == status) {
-                                        List<String> visitedResource = task.getVisitedResources();
-                                        if(ArrayUtils.contains(visitedResource.toArray(new String[visitedResource.size()]), context)) {
+                                        Set<String> visitedResource = task.getAllocatedResources().getLast().getVisitedResources();
+                                        for(String res: visitedResource){
+                                                if(res.contains(context)){
+                                                        taskList.add(task);
+                                                        break;
+                                                }
+                                        }
+                                        if(task.getSchedulerName().contains(context)) {
                                                 taskList.add(task);
                                         }