From d3578a4742a4d46d9ee38aa37e18f5483759278c Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Mon, 3 Oct 2005 16:57:34 +0000
Subject: Refactored code to work-around DB 4.3's DB_BUFFER_SMALL bug

---
 cpp/src/Freeze/IndexI.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'cpp/src/Freeze/IndexI.cpp')

diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp
index 1b6ee29b84e..cb7694b5906 100644
--- a/cpp/src/Freeze/IndexI.cpp
+++ b/cpp/src/Freeze/IndexI.cpp
@@ -100,9 +100,13 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const
 			    }
 			    break; // for(;;)
 			}
-			catch(const DbMemoryException& dx)
+			catch(const DbDeadlockException&)
 			{
-			    handleMemoryException(dx, pkey, pdbKey);
+			    throw;
+			}
+			catch(const DbException& dx)
+			{
+			    handleDbException(dx, pkey, pdbKey, __FILE__, __LINE__);
 			}
 		    }
 		}		    
@@ -161,9 +165,7 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const
     }
     catch(const DbException& dx)
     {
-	DatabaseException ex(__FILE__, __LINE__);
-	ex.message = dx.what();
-	throw ex;
+	handleDbException(dx, __FILE__, __LINE__);
     }
     
     return identities;
-- 
cgit v1.2.3