Merge pull request #4070 from atlanhq/MLH-44

MLH-44 Fix fetching relationship attributes NPE for corrupt vertex
atlanhq · Feb 3, 2025 · ae810f5 · ae810f5
2 parents 777aa9a + 45b3de7
commit ae810f5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java b/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java
@@ -1887,15 +1887,23 @@ private AtlasObjectId mapVertexToObjectId(AtlasVertex entityVertex, String edgeL
                 } else {
                     ret = toAtlasObjectId(referenceVertex);
                 }
+
+                if (ret == null) {
+                    LOG.warn("Found corrupted vertex with Id: {}", referenceVertex.getIdForDisplay());
+                }
             }
 
-            if (RequestContext.get().isIncludeRelationshipAttributes()) {
+            if (ret != null && RequestContext.get().isIncludeRelationshipAttributes()) {
                 String relationshipTypeName = GraphHelper.getTypeName(edge);
                 boolean isRelationshipAttribute = typeRegistry.getRelationshipDefByName(relationshipTypeName) != null;
                 if (isRelationshipAttribute) {
                     AtlasRelationship relationship = mapEdgeToAtlasRelationship(edge);
                     Map<String, Object> relationshipAttributes = mapOf("typeName", relationshipTypeName);
                     relationshipAttributes.put("attributes", relationship.getAttributes());
+
+                    if (ret.getAttributes() == null) {
+                        ret.setAttributes(new HashMap<>());
+                    }
                     ret.getAttributes().put("relationshipAttributes", relationshipAttributes);
                 }
             }