Repository: incubator-atlas Updated Branches: refs/heads/master 2dd0f0709 -> a9f3da62d
ATLAS-1686: fixed import to use the given guid, instead of looking into store with unique attribute Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/a9f3da62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/a9f3da62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/a9f3da62 Branch: refs/heads/master Commit: a9f3da62d4c131c837a908c27555fb66bcdcdd05 Parents: 2dd0f07 Author: ashutoshm <[email protected]> Authored: Mon Mar 27 15:33:14 2017 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Mar 27 22:46:31 2017 -0700 ---------------------------------------------------------------------- .../atlas/repository/store/graph/v1/IDBasedEntityResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a9f3da62/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 @@ public class IDBasedEntityResolver implements EntityResolver { 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
