Merge pull request #472 from oozie/next_fix_queryui2

Fix #452 Protect the UI from getting stuck when no tags are returned.
OpenTSDB · Apr 1, 2015 · 437ace2 · 437ace2
2 parents 87927d6 + 402ba24
commit 437ace2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/tsd/client/QueryUi.java b/src/tsd/client/QueryUi.java
@@ -956,9 +956,11 @@ public void got(final JSONValue json) {
             }
             final MetricForm metric = (MetricForm) widget;
             final JSONArray tags = etags.get(i).isArray();
-            final int ntags = tags.size();
-            for (int j = 0; j < ntags; j++) {
-              metric.autoSuggestTag(tags.get(j).isString().stringValue());
+            // Skip if no tags were associated with the query.
+            if (null != tags) {
+              for (int j = 0; j < tags.size(); j++) {
+                metric.autoSuggestTag(tags.get(j).isString().stringValue());
+              }
             }
           }
         }