diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:49:00 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:49:00 -0500 |
| commit | 99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db (patch) | |
| tree | 1629e081bdbf6cfd412b36f19b1eb5f1f0face2b /cpp/src/Freeze/ObjectStore.cpp | |
| parent | Fixed bug #2562 (diff) | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.tar.bz2 ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.tar.xz ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.zip | |
Merge branch 'master' of cvs:/home/git/ice
Diffstat (limited to 'cpp/src/Freeze/ObjectStore.cpp')
| -rw-r--r-- | cpp/src/Freeze/ObjectStore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index 1d554c6bc2a..53f1c6140ac 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -255,7 +255,7 @@ Freeze::ObjectStoreBase::dbHasObject(const Identity& ident, const TransactionIPt if(tx != 0) { - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction); } // Else, try again } @@ -406,7 +406,7 @@ Freeze::ObjectStoreBase::load(const Identity& ident, const TransactionIPtr& tran out << "Deadlock in Freeze::ObjectStoreBase::load while searching \"" << _evictor->filename() + "/" + _dbName << "\""; } - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction); } catch(const DbException& dx) { @@ -458,7 +458,7 @@ Freeze::ObjectStoreBase::update(const Identity& ident, const ObjectRecord& rec, out << "Deadlock in Freeze::ObjectStoreBase::update while updating \"" << _evictor->filename() + "/" + _dbName << "\""; } - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction); } catch(const DbException& dx) { @@ -511,7 +511,7 @@ Freeze::ObjectStoreBase::insert(const Identity& ident, const ObjectRecord& rec, } if(tx != 0) { - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction); } // // Otherwise, try again @@ -559,7 +559,7 @@ Freeze::ObjectStoreBase::remove(const Identity& ident, const TransactionIPtr& tr } if(tx != 0) { - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction); } // // Otherwise, try again |