Bug 4407 - Fixed C++Builder test failure

3 files changed, 4 insertions, 12 deletions

diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 654ab9becba..bdd5b1ea0c3 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -280,14 +280,10 @@ Ice::AsyncResult::__exceptionAsync(const Ice::Exception& ex)
     // from this thread. Instead the exception callback is called asynchronously from
     // the client thread pool.
     //
-    try
-    {
-        _instance->clientThreadPool()->execute(new AsynchronousException(_instance, this, ex));
-    }
-    catch(const Ice::CommunicatorDestroyedException&)
-    {
-        throw; // CommunicatorDestroyedException is the only exception that can propagate directly.
-    }
+    // CommunicatorDestroyedException is the only exception that can propagate directly
+    // from this method.
+    //
+    _instance->clientThreadPool()->execute(new AsynchronousException(_instance, this, ex));
 }
 
 void
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
index 18a42616443..fd12efca5f9 100644
--- a/cpp/test/Ice/ami/AllTests.cpp
+++ b/cpp/test/Ice/ami/AllTests.cpp
@@ -939,7 +939,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
         {
         }
 
-#ifndef __BCPLUSPLUS__
 	//
         // Check that CommunicatorDestroyedException is raised directly.
 	//
@@ -959,7 +958,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
         {
             // Expected.
         }
-#endif
     }
     cout << "ok" << endl;
 
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index c3360f4d1af..42b694b028b 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -969,7 +969,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         cb->check();
     }
 
-#ifndef __BCPLUSPLUS__
     {
 	//
         // Check that CommunicatorDestroyedException is raised directly.
@@ -993,7 +992,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
             // Expected.
         }
     }
-#endif
 
     {
         AMI_MyClass_opByteIPtr cb = new AMI_MyClass_opByteI;