Merge remote branch 'origin/upstream' into tempbranch

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

Index: frontend/client/src/autotest/afe/JobStatusDataSource.java
diff --git a/frontend/client/src/autotest/afe/JobStatusDataSource.java b/frontend/client/src/autotest/afe/JobStatusDataSource.java
index 5632d4f914a63e50bc5693d9377f05a63a93dac0..91ca6df3d6b0f5b9ba7efa41f40cfd2965eaebc0 100644
--- a/frontend/client/src/autotest/afe/JobStatusDataSource.java
+++ b/frontend/client/src/autotest/afe/JobStatusDataSource.java
@@ -53,16 +53,21 @@ class JobStatusDataSource extends RpcDataSource {
             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);