From eac6b3e8cca36264f6a3ba3bafb365ef58fb1783 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Fri, 4 Apr 2008 09:55:15 -0230
Subject: Port to CodeGear C++Builder 2007

---
 cpp/src/Ice/ConnectionRequestHandler.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp')

diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index d65e9fd449c..44d004fd2da 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -21,7 +21,19 @@ using namespace IceInternal;
 ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference, const Ice::ObjectPrx& proxy) :
     RequestHandler(reference)
 {
-    _connection = _reference->getConnection(_compress);
+// COMPILERFIX: Without the catch/rethrow C++Builder 2007 can get access violations.
+#ifdef __BCPLUSPLUS__ 
+    try
+    {
+#endif
+        _connection = _reference->getConnection(_compress);
+#ifdef __BCPLUSPLUS__
+    }
+    catch(const Ice::LocalException&)
+    {
+        throw;
+    }
+#endif
     RouterInfoPtr ri = reference->getRouterInfo();
     if(ri)
     {
-- 
cgit v1.2.3