[fix] handle null exception

atlanhq · Aug 22, 2024 · 3172f85 · 3172f85
1 parent 39801ce
commit 3172f85
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/repository/src/main/java/org/apache/atlas/discovery/EntityLineageService.java b/repository/src/main/java/org/apache/atlas/discovery/EntityLineageService.java
@@ -585,16 +585,18 @@ private void updateParentNodesForEachEntity(AtlasLineageListContext lineageListC
                             Set<String> seenGuids = new HashSet<>();
                             List<Map<String,String>> parentNodesOfParentWithDetails = new ArrayList<>();
                             for (String parentNode : parentNodes) {
-                                List<String> parentsOfParentNodes = lineageParentsForEntityMap.get(parentNode);
-                                if (parentsOfParentNodes != null){
-                                    for (String parentOfParent : parentsOfParentNodes) {
-                                        AtlasVertex vertex = AtlasGraphUtilsV2.findByGuid(this.graph, parentOfParent);
-                                        if (vertex != null) {
-                                            Map<String, String> details = fetchAttributes(vertex, FETCH_ENTITY_ATTRIBUTES);
-                                            // Check if the guid is already in the set
-                                            if (!seenGuids.contains(parentOfParent)) {
-                                                parentNodesOfParentWithDetails.add(details);
-                                                seenGuids.add(parentOfParent); // Add the guid to the set
+                                if(lineageParentsForEntityMap.containsKey(parentNode)){
+                                    List<String> parentsOfParentNodes = lineageParentsForEntityMap.get(parentNode);
+                                    if (parentsOfParentNodes != null){
+                                        for (String parentOfParent : parentsOfParentNodes) {
+                                            AtlasVertex vertex = AtlasGraphUtilsV2.findByGuid(this.graph, parentOfParent);
+                                            if (vertex != null) {
+                                                Map<String, String> details = fetchAttributes(vertex, FETCH_ENTITY_ATTRIBUTES);
+                                                // Check if the guid is already in the set
+                                                if (!seenGuids.contains(parentOfParent)) {
+                                                    parentNodesOfParentWithDetails.add(details);
+                                                    seenGuids.add(parentOfParent); // Add the guid to the set
+                                                }
                                             }
                                         }
                                     }
@@ -617,16 +619,18 @@ private void updateParentNodesForEachEntity(AtlasLineageListContext lineageListC
                             Set<String> seenGuids = new HashSet<>();
                             List<Map<String,String>> childrenNodesOfChildrenWithDetails = new ArrayList<>();
                             for (String childNode : childrenNodes) {
-                                // Add all children for the current childNode
-                                List<String> childrenOfChildNode = lineageChildrenForEntityMap.get(childNode);
-                                if (childrenOfChildNode != null){
-                                    for (String childOfChild : childrenOfChildNode) {
-                                        AtlasVertex vertex = AtlasGraphUtilsV2.findByGuid(this.graph, childOfChild);
-                                        if (vertex != null) {
-                                            Map<String, String> details = fetchAttributes(vertex, FETCH_ENTITY_ATTRIBUTES);
-                                            if (!seenGuids.contains(childOfChild)) {
-                                                childrenNodesOfChildrenWithDetails.add(details);
-                                                seenGuids.add(childOfChild); // Add the guid to the set
+                                if(lineageChildrenForEntityMap.containsKey(childNode)){
+                                    // Add all children for the current childNode
+                                    List<String> childrenOfChildNode = lineageChildrenForEntityMap.get(childNode);
+                                    if (childrenOfChildNode != null){
+                                        for (String childOfChild : childrenOfChildNode) {
+                                            AtlasVertex vertex = AtlasGraphUtilsV2.findByGuid(this.graph, childOfChild);
+                                            if (vertex != null) {
+                                                Map<String, String> details = fetchAttributes(vertex, FETCH_ENTITY_ATTRIBUTES);
+                                                if (!seenGuids.contains(childOfChild)) {
+                                                    childrenNodesOfChildrenWithDetails.add(details);
+                                                    seenGuids.add(childOfChild); // Add the guid to the set
+                                                }
                                             }
                                         }
                                     }