diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-01-06 21:42:44 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-01-06 21:42:44 +0000 |
| commit | 9188c76db34d13e18c93a4a070e8f023560b75c5 (patch) | |
| tree | 71ed86f07b93b448e259582c352deba37ec3b972 /cpp/src/Freeze/Util.cpp | |
| parent | SRPM generation fixes (diff) | |
| download | ice-9188c76db34d13e18c93a4a070e8f023560b75c5.tar.bz2 ice-9188c76db34d13e18c93a4a070e8f023560b75c5.tar.xz ice-9188c76db34d13e18c93a4a070e8f023560b75c5.zip | |
Merge from R3_0_branch
Diffstat (limited to 'cpp/src/Freeze/Util.cpp')
| -rw-r--r-- | cpp/src/Freeze/Util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp index 73ef47cb4eb..17ad78e03aa 100644 --- a/cpp/src/Freeze/Util.cpp +++ b/cpp/src/Freeze/Util.cpp @@ -30,7 +30,7 @@ Freeze::handleDbException(const DbException& dx, #if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2) (dx.get_errno() == ENOMEM); #else - (dx.get_errno() == DB_BUFFER_SMALL); + (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM); #endif if(bufferSmallException && (dbKey.get_size() > dbKey.get_ulen())) @@ -60,7 +60,7 @@ Freeze::handleDbException(const DbException& dx, #if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2) (dx.get_errno() == ENOMEM); #else - (dx.get_errno() == DB_BUFFER_SMALL); + (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM); #endif bool resized = false; |