ATLAS-2814: Fixed merge error.
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/985d06d0 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/985d06d0 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/985d06d0 Branch: refs/heads/branch-1.0 Commit: 985d06d03a428ba57f902d6edbdc633823b91559 Parents: 2ae7a0a Author: Ashutosh Mestry <ames...@hortonworks.com> Authored: Thu Oct 11 22:36:01 2018 -0700 Committer: Ashutosh Mestry <ames...@hortonworks.com> Committed: Thu Nov 1 15:42:57 2018 -0700 ---------------------------------------------------------------------- .../patches/001-base_model_replication_attributes.json | 10 ++++++++-- .../atlas/repository/impexp/AtlasServerService.java | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/985d06d0/addons/models/0000-Area0/patches/001-base_model_replication_attributes.json ---------------------------------------------------------------------- diff --git a/addons/models/0000-Area0/patches/001-base_model_replication_attributes.json b/addons/models/0000-Area0/patches/001-base_model_replication_attributes.json index 323a818..92c561f 100644 --- a/addons/models/0000-Area0/patches/001-base_model_replication_attributes.json +++ b/addons/models/0000-Area0/patches/001-base_model_replication_attributes.json @@ -13,7 +13,10 @@ "cardinality": "SET", "isIndexable": false, "isOptional": true, - "isUnique": false + "isUnique": false, + "options": { + "isSoftReference": "true" + } }, { "name": "replicatedTo", @@ -21,7 +24,10 @@ "cardinality": "SET", "isIndexable": false, "isOptional": true, - "isUnique": false + "isUnique": false, + "options": { + "isSoftReference": "true" + } } ] } http://git-wip-us.apache.org/repos/asf/atlas/blob/985d06d0/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java index 8859a9d..3e0d580 100644 --- a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java +++ b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java @@ -88,8 +88,13 @@ public class AtlasServerService { } @GraphTransaction - public AtlasServer save(AtlasServer server) throws AtlasBaseException { - return dataAccess.save(server); + public AtlasServer save(AtlasServer server) { + try { + return dataAccess.save(server); + } + catch (AtlasBaseException ex) { + return server; + } } @GraphTransaction @@ -100,7 +105,7 @@ public class AtlasServerService { AtlasObjectId objectId = getObjectId(server); for (String guid : entityGuids) { - AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo = entityStore.getById(guid); + AtlasEntity.AtlasEntityWithExtInfo entityWithExtInfo = entityStore.getById(guid, false); updateAttribute(entityWithExtInfo, attributeName, objectId); } }
