diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-09-26 12:39:07 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-09-26 12:39:07 +0000 |
| commit | e2ef041325c41f50869d620ff1545e913c0be471 (patch) | |
| tree | ef273442aef3772ecf0c757c2010d0f75058ea6d /cpp/src/Freeze/ObjectStore.cpp | |
| parent | Bug 490 - Need to check for DB_BUFFER_SMALL to resize keys (diff) | |
| download | ice-e2ef041325c41f50869d620ff1545e913c0be471.tar.bz2 ice-e2ef041325c41f50869d620ff1545e913c0be471.tar.xz ice-e2ef041325c41f50869d620ff1545e913c0be471.zip | |
Backed out previous change, failing on Windows.
Diffstat (limited to 'cpp/src/Freeze/ObjectStore.cpp')
| -rw-r--r-- | cpp/src/Freeze/ObjectStore.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index 00d244f0308..a8cc39c9079 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -336,6 +336,10 @@ Freeze::ObjectStore::load(const Identity& ident) } break; // for(;;) } + catch(const DbMemoryException& dx) + { + handleMemoryException(dx, value, dbValue); + } catch(const DbDeadlockException&) { if(_evictor->deadlockWarning()) @@ -350,14 +354,9 @@ Freeze::ObjectStore::load(const Identity& ident) } catch(const DbException& dx) { - if(dx.get_errno() == DB_BUFFER_SMALL) - { - handleMemoryException(dx, value, dbValue); - } - else - { - throw dx; - } + DatabaseException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; } } |