ATLAS-2814: Fixed merge error.

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"
+          }
         }
       ]
     }

repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java

@@ -88,9 +88,14 @@ public class AtlasServerService {
     }
 
     @GraphTransaction
-    public AtlasServer save(AtlasServer server) throws AtlasBaseException {
+    public AtlasServer save(AtlasServer server) {
+        try {
             return dataAccess.save(server);
         }
+        catch (AtlasBaseException ex) {
+            return server;
+        }
+    }
 
     @GraphTransaction
     public void updateEntitiesWithServer(AtlasServer server, List<String> entityGuids, String attributeName) throws AtlasBaseException {
@@ -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);
         }
     }