From cd8abbb04a79b0d93f34742c49b06607e4e989f7 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 30 May 2007 13:18:35 +0000 Subject: Removed transactional evictor context --- cpp/src/Freeze/IndexI.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cpp/src/Freeze/IndexI.cpp') 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 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 -- cgit v1.2.3