refactor WrappingReportTable

spacious-team · Dec 23, 2021 · 90e6735 · 90e6735
1 parent 64d4f66
commit 90e6735
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/main/java/org/spacious_team/broker/report_parser/api/WrappingReportTable.java b/src/main/java/org/spacious_team/broker/report_parser/api/WrappingReportTable.java
@@ -81,20 +81,30 @@ public EagerWrappingReportTable(BrokerReport report, Collection<RowType>... data
         }
     }
 
-    @RequiredArgsConstructor
     private static class LazyWrappingReportTable<RowType> implements ReportTable<RowType> {
         @Getter
         private final BrokerReport report;
-        private final ReportTable<RowType>[] tables;
+        private volatile ReportTable<RowType>[] tables;
         private volatile List<RowType> data;
 
+        @SafeVarargs
+        private LazyWrappingReportTable(BrokerReport report, ReportTable<RowType>... tables) {
+            this.report = report;
+            this.tables = tables;
+        }
+
         @Override
         public List<RowType> getData() {
             if (data == null) {
-                data = Arrays.stream(tables)
-                        .map(ReportTable::getData)
-                        .flatMap(Collection::stream)
-                        .collect(Collectors.toUnmodifiableList());
+                synchronized (this) {
+                    if (data == null) {
+                        data = Arrays.stream(tables)
+                                .map(ReportTable::getData)
+                                .flatMap(Collection::stream)
+                                .collect(Collectors.toUnmodifiableList());
+                        tables = null; // erase for GC
+                    }
+                }
             }
             return data;
         }