Needed to make it work with multiple jobs in the queue.

intel-cloud · Jan 8, 2015 · 4421dc9 · 4421dc9
1 parent 97a50b1
commit 4421dc9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/dev/cosbench-controller-web/src/com/intel/cosbench/controller/handler/IndexHandler.java b/dev/cosbench-controller-web/src/com/intel/cosbench/controller/handler/IndexHandler.java
@@ -44,11 +44,16 @@ protected String process(HttpServletRequest req, HttpServletResponse res)
         buffer.append('\n');
         WorkloadInfo[] workloads = controller.getActiveWorkloads();
         buffer.append("Active Workloads:").append('\n');
-        for (WorkloadInfo workload : workloads)
+        for (WorkloadInfo workload : workloads) {
             buffer.append(workload.getId()).append('\t')
                     .append(workload.getSubmitDate()).append('\t')
-                    .append(workload.getState()).append('\t')
-                    .append(workload.getCurrentStage().getId()).append('\n');
+                    .append(workload.getState()).append('\t');
+                    if (workload.getCurrentStage() != null) {
+                    	buffer.append(workload.getCurrentStage().getId()).append('\n');	
+                    } else {
+                    	buffer.append("None").append('\n');
+                    }
+        }
         buffer.append("Total:").append(' ').append(workloads.length)
                 .append(' ').append("active workloads").append('\n');
         return buffer.toString();