Merge remote branch 'origin/upstream' into tempbranch

frontend/client/src/autotest/afe/JobStatusDataSource.java

 package autotest.afe;
 
 import autotest.common.StaticDataRepository;
 import autotest.common.Utils;
 import autotest.common.table.RpcDataSource;
 import autotest.common.ui.NotifyManager;
 
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
@@ skipping 35 matching lines @@
     protected List<JSONObject> handleJsonResult(JSONValue result) {
         List<JSONObject> queueEntries = super.handleJsonResult(result);
         List<JSONObject> rows = new ArrayList<JSONObject>();
         Map<List<String>, JSONObject> metaHostEntries= new HashMap<List<String>, JSONObject>();
         for(JSONObject queueEntry : queueEntries) {
             // translate status
             String status = queueEntry.get("status").isString().stringValue();
             String translation = translateStatus(status);
             queueEntry.put("status", new JSONString(translation));
             
-            JSONValue host = queueEntry.get("host");
-            if (host.isNull() != null) {
+            boolean hasHost = (queueEntry.get("host").isNull() == null);
+            boolean hasMetaHost = (queueEntry.get("meta_host") == null);
+            
+            if (!hasHost && !hasMetaHost) {
+                queueEntry.put("hostname", new JSONString("(hostless)"));
+                rows.add(queueEntry);
+                
+            } else if (!hasHost && hasMetaHost) {
                 // metahost
                 incrementMetaHostCount(metaHostEntries, queueEntry);
-                continue;
+            } else {
+                // non-metahost
+                processHostData(queueEntry);
+                rows.add(queueEntry);
             }
-            
-            // non-metahost
-            processHostData(queueEntry);
-            rows.add(queueEntry);
         }
         
         addMetaHostRows(metaHostEntries, rows);
         
         return rows;
     }
     
     protected void processHostData(JSONObject queueEntry) {
         JSONObject host = queueEntry.get("host").isObject();
         queueEntry.put("hostname", host.get("hostname"));
@@ skipping 36 matching lines @@
             String label = Utils.jsonToString(entry.get("meta_host"));
             String status = Utils.jsonToString(entry.get("status"));
             int count = entry.get("id_list").isArray().size();
             
             entry.put("hostname", new JSONString(label + " (label)"));
             entry.put("status", new JSONString(Integer.toString(count) + " " + status));
             rows.add(entry);
         }
     }
 }