storage: Fix exception modifying an emptyList() #TASK-5876

opencb · Apr 18, 2024 · ab3c55e · ab3c55e
1 parent bde39d3
commit ab3c55e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...-core/src/main/java/org/opencb/opencga/storage/core/variant/query/VariantQueryResult.java b/...-core/src/main/java/org/opencb/opencga/storage/core/variant/query/VariantQueryResult.java
@@ -24,6 +24,7 @@
 import org.opencb.opencga.storage.core.variant.query.projection.VariantQueryProjection;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -134,6 +135,10 @@ public VariantQueryResult(DataResult<T> dataResult) {
     private void addSamplesMetadataIfRequested(ParsedVariantQuery query) {
         VariantQueryProjection projection = query.getProjection();
 
+        // Ensure is modifiable
+        if (getEvents() == null || Collections.emptyList().getClass().equals(getEvents().getClass())) {
+            setEvents(new ArrayList<>());
+        }
         if (!query.getEvents().isEmpty()) {
             getEvents().addAll(query.getEvents());
         }