diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/DataExplorerQueryV4.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/DataExplorerQueryV4.java index 05d4f79872..5bb56b3756 100644 --- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/DataExplorerQueryV4.java +++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/v4/query/DataExplorerQueryV4.java @@ -169,7 +169,7 @@ protected SpQueryResult postQuery(QueryResult queryResult, boolean ignoreMissingValues) throws RuntimeException { SpQueryResult result = new SpQueryResult(); - if (queryResult.getResults().get(0).getSeries() != null) { + if (hasResult(queryResult)) { result.setTotal(queryResult.getResults().get(0).getSeries().size()); queryResult.getResults().get(0).getSeries().forEach(rs -> { DataSeries series = convertResult(rs, ignoreMissingValues); @@ -185,6 +185,12 @@ protected SpQueryResult postQuery(QueryResult queryResult, return result; } + private boolean hasResult(QueryResult queryResult) { + return queryResult.getResults() != null + && queryResult.getResults().size() > 0 + && queryResult.getResults().get(0).getSeries() != null; + } + protected List> getQueryElements() { List> queryElements = new ArrayList<>();