ATLAS-2553: Glossary (DataAccess fix)

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()));
         }
     }
 

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 {