summaryrefslogtreecommitdiff
path: root/java/src/Freeze/SharedDb.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-11-19 16:13:05 -0500
committerBernard Normier <bernard@zeroc.com>2007-11-19 16:13:05 -0500
commita9b2a73a6c8897e84e5e64ee8b41fe17b06d3f54 (patch)
treeeb1216068d7e9be1c1039f13953b2101f00aa60f /java/src/Freeze/SharedDb.java
parentAdded IceSL makedist.py (diff)
downloadice-a9b2a73a6c8897e84e5e64ee8b41fe17b06d3f54.tar.bz2
ice-a9b2a73a6c8897e84e5e64ee8b41fe17b06d3f54.tar.xz
ice-a9b2a73a6c8897e84e5e64ee8b41fe17b06d3f54.zip
Fixed bug #2543
Diffstat (limited to 'java/src/Freeze/SharedDb.java')
-rwxr-xr-xjava/src/Freeze/SharedDb.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java
index c212510c309..b8fa5eaad2c 100755
--- a/java/src/Freeze/SharedDb.java
+++ b/java/src/Freeze/SharedDb.java
@@ -127,8 +127,10 @@ class SharedDb
Object previousValue = _map.put(catalogMapKey, result[0]);
assert(previousValue == null);
+ result[0]._inMap = true;
previousValue = _map.put(catalogIndexListMapKey, result[1]);
assert(previousValue == null);
+ result[1]._inMap = true;
return result;
}
@@ -448,7 +450,7 @@ class SharedDb
else
{
cleanupIndices();
- DeadlockException ex = new DeadlockException(errorPrefix(_mapKey) + "Db.open: " + dx.getMessage());
+ DeadlockException ex = new DeadlockException(errorPrefix(_mapKey) + "Db.open: " + dx.getMessage(), tx);
ex.initCause(dx);
throw ex;
}