http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2140 - Remove code no longer required nowa

that IceUtil::Exception inherits from std::exception

1 files changed, 10 insertions, 25 deletions

diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 88f51469587..40cb5336c23 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -181,10 +181,6 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
     {
         __response(replyStatus == replyOK);
     }
-    catch(const Exception& ex)
-    {
-        warning(ex);
-    }
     catch(const std::exception& ex)
     {
         warning(ex);
@@ -235,10 +231,6 @@ IceInternal::OutgoingAsync::__finished(const LocalException& exc)
     {
         ice_exception(exc);
     }
-    catch(const Exception& ex)
-    {
-        warning(ex);
-    }
     catch(const std::exception& ex)
     {
         warning(ex);
@@ -382,22 +374,7 @@ IceInternal::OutgoingAsync::__send()
 }
 
 void
-IceInternal::OutgoingAsync::warning(const Exception& ex) const
-{
-    if(__os) // Don't print anything if cleanup() was already called.
-    {
-        ReferencePtr ref = _proxy->__reference();
-        if(ref->getInstance()->initializationData().properties->
-                getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
-        {
-            Warning out(ref->getInstance()->initializationData().logger);
-            out << "Ice::Exception raised by AMI callback:\n" << ex;
-        }
-    }
-}
-
-void
-IceInternal::OutgoingAsync::warning(const std::exception& ex) const
+IceInternal::OutgoingAsync::warning(const std::exception& exc) const
 {
     if(__os) // Don't print anything if cleanup() was already called.
     {
@@ -406,7 +383,15 @@ IceInternal::OutgoingAsync::warning(const std::exception& ex) const
                 getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
         {
             Warning out(ref->getInstance()->initializationData().logger);
-            out << "std::exception raised by AMI callback:\n" << ex.what();
+            const Exception* ex = dynamic_cast<const ObjectNotExistException*>(&exc);
+            if(ex)
+            {
+                out << "Ice::Exception raised by AMI callback:\n" << ex;
+            }
+            else
+            {
+                out << "std::exception raised by AMI callback:\n" << exc.what();
+            }
         }
     }
 }