diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-12-31 14:34:37 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-12-31 14:34:37 -0500 |
| commit | a0dfb6ad783f35c1b0cad78b9cdae077b57d6de3 (patch) | |
| tree | 31fd8eb1d67cce0091b3f1757da55b2114af9363 /java/src | |
| parent | Merge branch 'R3_3_branch' of ssh://git/home/git/ice into R3_3_branch (diff) | |
| download | ice-a0dfb6ad783f35c1b0cad78b9cdae077b57d6de3.tar.bz2 ice-a0dfb6ad783f35c1b0cad78b9cdae077b57d6de3.tar.xz ice-a0dfb6ad783f35c1b0cad78b9cdae077b57d6de3.zip | |
Fixed bug #3232 (Freeze transactional evictor leaks)
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Freeze/TransactionI.java | 9 | ||||
| -rw-r--r-- | java/src/Freeze/TransactionalEvictorI.java | 10 |
2 files changed, 18 insertions, 1 deletions
diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java index b1d0a807048..e05eab4c663 100644 --- a/java/src/Freeze/TransactionI.java +++ b/java/src/Freeze/TransactionI.java @@ -222,7 +222,14 @@ class TransactionI implements Transaction { if(_postCompletionCallback != null) { - _postCompletionCallback.postCompletion(committed, deadlock); + try + { + _postCompletionCallback.postCompletion(committed, deadlock); + } + finally + { + _postCompletionCallback = null; + } } } diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/TransactionalEvictorI.java index 6d44f055ea3..26623346c53 100644 --- a/java/src/Freeze/TransactionalEvictorI.java +++ b/java/src/Freeze/TransactionalEvictorI.java @@ -252,6 +252,16 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor { if(_deactivateController.deactivate()) { + synchronized(this) + { + // + // Set the evictor size to zero, meaning that we will evict + // everything possible. + // + _evictorSize = 0; + evict(); + } + try { closeDbEnv(); |