ATLAS-2909: ChangeMarker updated during initialization.

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

@@ -88,13 +88,8 @@ public class AtlasServerService {
     }
 
     @GraphTransaction
-    public AtlasServer save(AtlasServer server) {
-
-        try {
-            return dataAccess.save(server);
-        } catch (AtlasBaseException e) {
-            return server;
-        }
+    public AtlasServer save(AtlasServer server) throws AtlasBaseException {
+       return dataAccess.save(server);
     }
 
     @GraphTransaction

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java

@@ -524,7 +524,7 @@ public class AtlasTypeDefGraphStoreV2 extends AtlasTypeDefGraphStore {
     }
 
     private String getCurrentUser() {
-        String ret = RequestContext.get().getUser();
+        String ret = RequestContext.getCurrentUser();
 
         if (StringUtils.isBlank(ret)) {
             ret = System.getProperty("user.name");

repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java

@@ -95,13 +95,11 @@ public class ExportServiceTest extends ExportImportTestBase {
     public void setupTest() throws IOException, AtlasBaseException {
         RequestContext.clear();
         RequestContext.get().setUser(TestUtilsV2.TEST_USER, null);
-        ZipFileResourceTestUtils.loadBaseModel(typeDefStore, typeRegistry);
+        basicSetup(typeDefStore, typeRegistry);
     }
 
     @BeforeClass
     public void setupSampleData() throws AtlasBaseException {
-        entityStore = new AtlasEntityStoreV2(deleteHandler, typeRegistry, mockChangeNotifier, graphMapper);;
-
         AtlasTypesDef sampleTypes = TestUtilsV2.defineDeptEmployeeTypes();
         AtlasTypesDef typesToCreate = AtlasTypeDefStoreInitializer.getTypesToCreate(sampleTypes, typeRegistry);
 

server-api/src/main/java/org/apache/atlas/RequestContext.java

@@ -93,6 +93,11 @@ public class RequestContext {
         CURRENT_CONTEXT.remove();
     }
 
+    public static String getCurrentUser() {
+        RequestContext context = CURRENT_CONTEXT.get();
+        return context != null ? context.getUser() : null;
+    }
+
     public String getUser() {
         return user;
     }