1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepositoryBuilder.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepositoryBuilder.java
index 5ac62e3..b98993e 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepositoryBuilder.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepositoryBuilder.java
@@ -85,6 +85,9 @@ public class JDBCRepositoryBuilder extends AbstractRepositoryBuilder {
 
     public Repository build(AtomicReference<Repository> rootRef) throws RepositoryException {
         assertReady();
+
+        final Repository originalRoot = rootRef.get();
+
         JDBCRepository repo = new JDBCRepository
             (rootRef, getName(), isMaster(), getTriggerFactories(),
              getDataSource(), getDataSourceCloseOnShutdown(),
@@ -94,7 +97,10 @@ public class JDBCRepositoryBuilder extends AbstractRepositoryBuilder {
              getSuppressReloadMap(),
              mSequenceSelectStatement, mForceStoredSequence, mPrimaryKeyCheckDisabled,
              mResolver);
-        rootRef.set(repo);
+
+        // Don't wipe out root when using BelatedRepositoryCreator.
+        rootRef.compareAndSet(originalRoot, repo);
+
         return repo;
     }