fix: Guard against NPE when fetching datastreams without any properties

kuseman · Feb 7, 2025 · 4d2018f · 4d2018f
1 parent fd2b3b2
commit 4d2018f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java b/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java
@@ -186,8 +186,10 @@ private static void appendDataStreamMappings(IQuerySession session, String catal
                             Map<String, Object> mappings = itt.index_template.template.mappings;
                             @SuppressWarnings("unchecked")
                             Map<String, Object> properties = (Map<String, Object>) mappings.get("properties");
-
-                            mergeProperties(result, ESCatalog.SINGLE_TYPE_TABLE_NAME, mappings, properties, itt.name);
+                            if (properties != null)
+                            {
+                                mergeProperties(result, ESCatalog.SINGLE_TYPE_TABLE_NAME, mappings, properties, itt.name);
+                            }
                         }
                     }