You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ap...@apache.org on 2018/04/11 20:47:36 UTC
atlas git commit: ATLAS-2553: Glossary (DataAccess fix)
Repository: atlas
Updated Branches:
refs/heads/master 54c31d5c8 -> bf5f8ef05
ATLAS-2553: Glossary (DataAccess fix)
Change-Id: Ia3222215ee527357fdc264445939e94e1afde068
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/bf5f8ef0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/bf5f8ef0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/bf5f8ef0
Branch: refs/heads/master
Commit: bf5f8ef05c650f49061d391c5f2606a394370f19
Parents: 54c31d5
Author: apoorvnaik <ap...@apache.org>
Authored: Wed Apr 11 13:30:25 2018 -0700
Committer: apoorvnaik <ap...@apache.org>
Committed: Wed Apr 11 13:47:18 2018 -0700
----------------------------------------------------------------------
.../org/apache/atlas/glossary/GlossaryService.java | 2 +-
.../org/apache/atlas/repository/ogm/DataAccess.java | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/bf5f8ef0/repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java b/repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java
index 91abf5e..49c8f51 100644
--- a/repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java
+++ b/repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java
@@ -882,7 +882,7 @@ public class GlossaryService {
if (DEBUG_ENABLED) {
LOG.debug("Creating relation between glossary = {} and term = {}", glossaryTerm.getAnchor().getGlossaryGuid(), saved.getGuid());
}
- createRelationship(defineTermAnchorRelation(glossaryTerm.getAnchor().getGlossaryGuid(), glossaryTerm.getGuid()));
+ createRelationship(defineTermAnchorRelation(glossaryTerm.getAnchor().getGlossaryGuid(), saved.getGuid()));
}
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/bf5f8ef0/repository/src/main/java/org/apache/atlas/repository/ogm/DataAccess.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/DataAccess.java b/repository/src/main/java/org/apache/atlas/repository/ogm/DataAccess.java
index e00c3e9..1473749 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/DataAccess.java
+++ b/repository/src/main/java/org/apache/atlas/repository/ogm/DataAccess.java
@@ -71,19 +71,6 @@ public class DataAccess {
throw new AtlasBaseException(AtlasErrorCode.DATA_ACCESS_SAVE_FAILED, obj.toString());
}
- // Since mutation context has guid information, attempt to set the same.
- if (entityMutationResponse.getFirstEntityCreated() != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Object created");
- }
- obj.setGuid(entityMutationResponse.getFirstEntityCreated().getGuid());
- } else if (entityMutationResponse.getFirstEntityUpdated() != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Object updated");
- }
- obj.setGuid(entityMutationResponse.getFirstEntityUpdated().getGuid());
- }
-
return this.load(obj);
} finally {