(atlas) branch branch-2.0 updated: Revert "ATLAS-4859 : NPE during Atlas Import"

[pinal]

This is an automated email from the ASF dual-hosted git repository.

pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 6edfce5ac Revert "ATLAS-4859 : NPE during Atlas Import"
6edfce5ac is described below

commit 6edfce5ac220b70a154db1cb26379b482d9e5e52
Author: Pinal Shah <pinal.s...@freestoneinfotech.com>
AuthorDate: Wed Sep 25 18:18:28 2024 +0700

    Revert "ATLAS-4859 : NPE during Atlas Import"
    
    This reverts commit 4e788f5d1fc68a456ce10afcd63eff3939cb7d11.
---
 .../atlas/repository/store/graph/v2/EntityGraphMapper.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
index 3f7f73e70..9d96fc1cc 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -2255,18 +2255,8 @@ public class EntityGraphMapper {
     }
 
     private boolean classificationHasPendingTask(AtlasTask task, String 
classificationVertexId, String entityGuid) {
-        if (task.getParameters() != null) {
-            if (classificationVertexId != null && entityGuid != null) {
-                return 
task.getParameters().get(ClassificationTask.PARAM_CLASSIFICATION_VERTEX_ID).equals(classificationVertexId)
-                        && 
task.getParameters().get(ClassificationTask.PARAM_ENTITY_GUID).equals(entityGuid);
-            } else {
-                LOG.warn("ClassificationVertexId and EntityGuid not found!");
-                return false;
-            }
-        } else {
-            LOG.warn("No task parameters found!");
-            return false;
-        }
+        return 
task.getParameters().get(ClassificationTask.PARAM_CLASSIFICATION_VERTEX_ID).equals(classificationVertexId)
+                && 
task.getParameters().get(ClassificationTask.PARAM_ENTITY_GUID).equals(entityGuid);
     }
 
     private AtlasEntity updateClassificationText(AtlasVertex vertex) throws 
AtlasBaseException {