diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2011-07-22 22:06:35 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2011-07-22 22:06:35 +0000 |
| commit | 83d83766e4a82051c440996738f4249a355ca0b6 (patch) | |
| tree | fdb6467f7f8cee2efe1174f2291d447ffa3e1bd8 /src/main | |
| parent | e2fc85fd55ccb8e2d2a8e66d9a91759650cb9f7f (diff) | |
Favor BDB repo for reconstructed layouts -- map repository has too many locking issues.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/layout/LayoutFactory.java | 7 |
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;
}
}
|