diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-05-30 13:18:35 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-05-30 13:18:35 +0000 |
| commit | cd8abbb04a79b0d93f34742c49b06607e4e989f7 (patch) | |
| tree | fabe04903dac6bd3ecf2ac6f3248ab5c22300fa7 /cpp/src/Freeze/IndexI.cpp | |
| parent | fix problem with possible use of uninitialized local variable (diff) | |
| download | ice-cd8abbb04a79b0d93f34742c49b06607e4e989f7.tar.bz2 ice-cd8abbb04a79b0d93f34742c49b06607e4e989f7.tar.xz ice-cd8abbb04a79b0d93f34742c49b06607e4e989f7.zip | |
Removed transactional evictor context
Diffstat (limited to 'cpp/src/Freeze/IndexI.cpp')
| -rw-r--r-- | cpp/src/Freeze/IndexI.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp index 5679e93fa02..11ea57a6db4 100644 --- a/cpp/src/Freeze/IndexI.cpp +++ b/cpp/src/Freeze/IndexI.cpp @@ -57,8 +57,9 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const Ice::CommunicatorPtr communicator = _store->communicator(); - DbTxn* tx = _store->evictor()->beforeQuery(); - + TransactionIPtr transaction = _store->evictor()->beforeQuery(); + DbTxn* tx = transaction == 0 ? 0 : transaction->dbTxn(); + vector<Identity> identities; try @@ -203,12 +204,13 @@ Freeze::IndexI::untypedCount(const Key& bytes) const // (ref Oracle SR 5925672.992) // dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); - Dbt dbValue; dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); - DbTxn* tx = _store->evictor()->beforeQuery(); + TransactionIPtr transaction = _store->evictor()->beforeQuery(); + DbTxn* tx = transaction == 0 ? 0 : transaction->dbTxn(); + Int result = 0; try |