Changeset 1451 for DCWoRMS/branches

Timestamp:

10/20/14 22:53:16 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -59 +59 @@
                                 if (task.getStatus() == status) {
                                         if(cr != null){
-                                                Set<ComputingResource> visitedResource = task.getAllocatedResources().getLast().getResources();
-                                                if(visitedResource.contains(cr)){
-                                                        taskList.add(task);
-                                                } else {
-                                                        for(ComputingResource res: visitedResource){
-                                                                if(cr.contains(res)){
+                                                if(!task.getAllocatedResources().isEmpty()){
+                                                        Set<ComputingResource> visitedResource = task.getAllocatedResources().getLast().getResources();
+                                                        if(visitedResource.contains(cr)){
+                                                                taskList.add(task);
+                                                        } else {
+                                                                for(ComputingResource res: visitedResource){
+                                                                        if(cr.contains(res)){
+                                                                                taskList.add(task);
+                                                                                break;
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        } else {
+                                                if(!task.getAllocatedResources().isEmpty()){
+                                                        Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
+                                                        for(String res: visitedResource){
+                                                                if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
                                                                         taskList.add(task);
                                                                         break;
                                                                 }
-                                                        }
-                                                }
-                                        } else {
-                                                Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
-                                                for(String res: visitedResource){
-                                                        if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
-                                                                taskList.add(task);
-                                                                break;
-                                                        }
+                                                        }       
                                                 }