commit a9f3da62d4c131c837a908c27555fb66bcdcdd05
author ashutoshm <amestry@hortonworks.com> Mon Mar 27 15:33:14 2017 -0700
committer Madhan Neethiraj <madhan@apache.org> Mon Mar 27 22:46:31 2017 -0700
tree 074e3848f0bddc54f41b23034feb575b241348c9
parent 2dd0f0709cbfb4dd9fbd8421640ee4067b730629

ATLAS-1686: fixed import to use the given guid, instead of looking into store with unique attribute

Signed-off-by: Madhan Neethiraj <madhan@apache.org>

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java

diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
index f53efe6..8b7ac8b 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
@@ -51,7 +51,7 @@
             boolean isAssignedGuid = AtlasTypeUtil.isAssignedGuid(guid);
             AtlasVertex vertex = isAssignedGuid ? AtlasGraphUtilsV1.findByGuid(guid) : null;
 
-            if (vertex == null) { // if not found in the store, look if the entity is present in the stream
+            if (vertex == null && !(entityStream instanceof EntityImportStream)) { // if not found in the store, look if the entity is present in the stream
                 AtlasEntity entity = entityStream.getByGuid(guid);
 
                 if (entity != null) { // look for the entity in the store using unique-attributes