IndexOutOfBoundsException when run diagram report with empty data #258

cuba-platform · Jun 11, 2020 · df434ad · df434ad
1 parent ca29720
commit df434ad
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/modules/global/src/com/haulmont/reports/entity/charts/ChartToJsonConverter.java b/modules/global/src/com/haulmont/reports/entity/charts/ChartToJsonConverter.java
@@ -128,11 +128,7 @@ public String convertSerialChart(SerialChartDescription description, List<Map<St
             graphs.add(graph);
         }
 
-        Optional.ofNullable(data.get(0)).ifPresent(map -> {
-            if (map instanceof EntityMap) {
-                sortByCategoryField(data, description.getCategoryField());
-            }
-        });
+        sortByCategoryFieldIfNeed(data, description.getCategoryField());
 
         JsonElement jsonTree = gson.toJsonTree(chart);
         jsonTree.getAsJsonObject().add("dataProvider", serializeData(data, fields));
@@ -145,7 +141,10 @@ public String convertSerialChart(SerialChartDescription description, List<Map<St
         return gson.toJson(jsonTree);
     }
 
-    private void sortByCategoryField(List<Map<String, Object>> data, String categoryField) {
+    private void sortByCategoryFieldIfNeed(List<Map<String, Object>> data, String categoryField) {
+        if (data.isEmpty() || !(data.get(0) instanceof EntityMap))
+            return;
+
         data.sort((entityMap1, entityMap2) -> {
             int compareResult;