chore: adds check for null values array in JSON desrializer

influxdata · Jul 12, 2024 · f3582c6 · f3582c6
1 parent 49450ec
commit f3582c6
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/client/src/main/java/com/influxdb/client/internal/InfluxQLQueryApiImpl.java b/client/src/main/java/com/influxdb/client/internal/InfluxQLQueryApiImpl.java
@@ -335,26 +335,28 @@ public InfluxQLQueryResult.Result deserialize(
                         serie = new InfluxQLQueryResult.Series(name, columns);
                     }
                     JsonArray jvals = sobj.get("values").getAsJsonArray();
-                    for (JsonElement jval : jvals) {
-                        List<Object> values = new ArrayList<>();
-                        JsonArray jae = jval.getAsJsonArray();
-                        int index = 0;
-                        for (JsonElement je : jae) {
-                            List<String> columnKeys = new ArrayList<>(serie.getColumns().keySet());
-                            if (extractor != null) {
-                                String stringVal = je.getAsString();
-                                Object ov = extractor.extractValue(
-                                  columnKeys.get(index),
-                                  stringVal,
-                                  id,
-                                  serie.getName());
-                                values.add(ov);
-                            } else {
-                                values.add(je.getAsString());
+                    if (jvals != null) {
+                        for (JsonElement jval : jvals) {
+                            List<Object> values = new ArrayList<>();
+                            JsonArray jae = jval.getAsJsonArray();
+                            int index = 0;
+                            for (JsonElement je : jae) {
+                                List<String> columnKeys = new ArrayList<>(serie.getColumns().keySet());
+                                if (extractor != null) {
+                                    String stringVal = je.getAsString();
+                                    Object ov = extractor.extractValue(
+                                      columnKeys.get(index),
+                                      stringVal,
+                                      id,
+                                      serie.getName());
+                                    values.add(ov);
+                                } else {
+                                    values.add(je.getAsString());
+                                }
+                                index++;
                             }
-                            index++;
+                            serie.addRecord(serie.new Record(values.toArray()));
                         }
-                        serie.addRecord(serie.new Record(values.toArray()));
                     }
                     series.add(serie);
                 }