diff options
| author | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
| commit | 4259685e44589a6efbb45f43f054b406dc8cf89c (patch) | |
| tree | d3e26a8201d782e4cd4f617c090cafe9e609d943 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Changed swish-e perl scripts to tolerate -IceTouch suffix and to avoid (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.bz2 ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.xz ice-4259685e44589a6efbb45f43f054b406dc8cf89c.zip | |
Merge branch 'R3_3_branch'
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 14da19924e7..788cb2cb373 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -174,7 +174,7 @@ IceInternal::OutgoingAsyncMessageCallback::__warning(const std::exception& exc) { if(__os) // Don't print anything if release() was already called. { - __warning(__os->instance()); + __warning(__os->instance(), exc); } } @@ -187,7 +187,7 @@ IceInternal::OutgoingAsyncMessageCallback::__warning(const InstancePtr& instance const Exception* ex = dynamic_cast<const Exception*>(&exc); if(ex) { - out << "Ice::Exception raised by AMI callback:\n" << ex; + out << "Ice::Exception raised by AMI callback:\n" << *ex; } else { @@ -434,7 +434,7 @@ IceInternal::OutgoingAsync::__finished(const Ice::LocalException& exc) } void -IceInternal::OutgoingAsync::__finished(const LocalExceptionWrapper& ex) +IceInternal::OutgoingAsync::__finished(const LocalExceptionWrapper& exc) { assert(__os && !_sent); @@ -446,7 +446,7 @@ IceInternal::OutgoingAsync::__finished(const LocalExceptionWrapper& ex) try { - handleException(ex); // This will throw if the invocation can't be retried. + handleException(exc); // This will throw if the invocation can't be retried. } catch(const Ice::LocalException& ex) { |