shortening of processing of empty result set

for csv output in /groupBy/tag requests
GIScience · Aug 24, 2020 · 90c0fbb · 90c0fbb
1 parent dbf44a1
commit 90c0fbb
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/main/java/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java b/src/main/java/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java
@@ -292,9 +292,9 @@ public void writeCsvResponse(GroupByObject[] resultSet, HttpServletResponse serv
       Pair<List<String>, List<String[]>> rows;
       if (resultSet instanceof GroupByResult[]) {
         if (resultSet.length == 0) {
-          List<String> column = new ArrayList<>();
-          column.add("timestamp");
-          rows = new ImmutablePair<>(column, null);
+          writer.writeNext(new String[] {"timestamp"}, false);
+          writer.close();
+          return;
         } else {
           GroupByResult result = (GroupByResult) resultSet[0];
           if (result.getResult() instanceof UsersResult[]) {
@@ -307,12 +307,8 @@ public void writeCsvResponse(GroupByObject[] resultSet, HttpServletResponse serv
         rows = createCsvResponseForElementsRatioGroupBy(resultSet);
       }
       writer.writeNext(rows.getLeft().toArray(new String[rows.getLeft().size()]), false);
-      if (rows.getRight() != null) {
-        writer.writeAll(rows.getRight(), false);
-        writer.close();
-      } else {
-        writer.close();
-      }
+      writer.writeAll(rows.getRight(), false);
+      writer.close();
     } catch (IOException e) {
       e.printStackTrace();
     }