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