fix(entity-service): fix findFirst when already present (#10187)

datahub-project · Apr 2, 2024 · 4bba834 · 4bba834
1 parent e0b20e1
commit 4bba834
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -930,7 +930,7 @@ public IngestResult ingestProposal(
             AspectsBatchImpl.builder().mcps(List.of(proposal), auditStamp, this).build(), async)
         .stream()
         .findFirst()
-        .get();
+        .orElse(null);
   }
 
   /**

diff --git a/...data-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java b/...data-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java
@@ -349,7 +349,7 @@ private void updateAspect(
     final IngestResult ingestProposalResult =
         _entityService.ingestProposal(proposal, auditStamp, false);
 
-    if (!ingestProposalResult.isSqlCommitted()) {
+    if (ingestProposalResult != null && !ingestProposalResult.isSqlCommitted()) {
       log.error(
           "Failed to ingest aspect with references removed. Before {}, after: {}, please check MCP processor"
               + " logs for more information",