Favor BDB repo for reconstructed layouts -- map repository has too many locking issues.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/amazon/carbonado/layout/LayoutFactory.java b/src/main/java/com/amazon/carbonado/layout/LayoutFactory.java
index d03b80c..67d4348 100644
--- a/src/main/java/com/amazon/carbonado/layout/LayoutFactory.java
+++ b/src/main/java/com/amazon/carbonado/layout/LayoutFactory.java
@@ -397,8 +397,11 @@ public class LayoutFactory implements LayoutCapability {
                 } catch (UniqueConstraintException e) {

                     StoredLayoutProperty existing = mPropertyStorage.prepare();

                     storedProperty.copyPrimaryKeyProperties(existing);

-                    existing.load();

-                    if (!existing.tryLoad() || !existing.equalProperties(storedProperty)) {

+                    if (!existing.tryLoad()) {

+                        throw e;

+                    }

+                    storedProperty.copyVersionProperty(existing);

+                    if (!existing.equalProperties(storedProperty)) {

                         throw e;

                     }

                 }