diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-28 13:09:41 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-28 13:09:41 +0000 |
| commit | ee35dbe702cfa2fdf8299a0129b5a3f508a9ffae (patch) | |
| tree | deaf73c9cf56118f513513c4889eb58c7176db22 | |
| parent | f3f0fd9fa1a9d5a69cec47fc2679a072799e6c77 (diff) | |
| download | ATCD-ee35dbe702cfa2fdf8299a0129b5a3f508a9ffae.tar.gz | |
Mon Jun 28 13:08:23 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp:
Fixed a bug which would swallow all exceptions from events.
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 09b089a6c7e..c6545e4176c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 28 13:08:23 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp: + + Fixed a bug which would swallow all exceptions from events. + Mon Jun 28 12:59:23 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp index 2b8cecb8e95..57032f8ec2d 100644 --- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp +++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp @@ -56,8 +56,6 @@ namespace DAnCE "Unable to load appropriate instance handler"); } - ::CORBA::Any_var instance_excep; - try { this->invoke (handler.in ()); @@ -69,7 +67,7 @@ namespace DAnCE ACE_TEXT ("Caught CORBA UserException while processing instance ") ACE_TEXT ("<%C>\n"), this->name_.c_str ())); - instance_excep = DAnCE::Utility::create_any_from_user_exception (ex); + this->instance_excep_ = DAnCE::Utility::create_any_from_user_exception (ex); } catch (CORBA::SystemException &ex) { @@ -78,7 +76,7 @@ namespace DAnCE ACE_TEXT ("Caught CORBA SystemException while processing instance ") ACE_TEXT ("<%C>\n"), this->name_.c_str ())); - instance_excep = DAnCE::Utility::create_any_from_exception (ex); + this->instance_excep_ = DAnCE::Utility::create_any_from_exception (ex); } catch (...) { @@ -92,12 +90,12 @@ namespace DAnCE "Caught unknown C++ exception from install"); } - Event_Result result (this->name_, instance_excep.ptr () != 0); + Event_Result result (this->name_, this->instance_excep_.ptr () != 0); if (!interceptors.empty ()) { DANCE_DEBUG (10, (LM_TRACE, DLINFO ACE_TEXT ("Action_Base::call - ") - ACE_TEXT ("Invoking post-install interceptors\n"))); + ACE_TEXT ("Invoking post-action interceptors\n"))); for (Plugin_Manager::INTERCEPTORS::const_iterator i = interceptors.begin (); i != interceptors.end (); ++i) @@ -114,7 +112,7 @@ namespace DAnCE ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("No post-install interceptors; directly propagating result\n"))); if (result.exception_) - result.contents_ = instance_excep._retn (); + result.contents_ = this->instance_excep_._retn (); else this->create_valid_result (result); } |