diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp | 19 |
2 files changed, 5 insertions, 16 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index 55c91b7644e..7f59e17ed6a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -453,7 +453,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, void Connection_Manager::destroy (const ACE_CString &flowname - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index 4d9fa718149..4dd7074aded 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -84,22 +84,11 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame, int Distributer_Receiver_Callback::handle_destroy (void) { - // Called when the sender requests the stream to be shutdown. - ACE_TRY_NEW_ENV - { - ACE_DEBUG ((LM_DEBUG, - "Distributer_Callback::end_stream\n")); + ACE_DEBUG ((LM_DEBUG, + "Distributer_Callback::end_stream\n")); - // We can close down now. - DISTRIBUTER::instance ()->done (1); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Distributer_Receiver_Callback::handle_destroy Failed\n"); - return -1; - } - ACE_ENDTRY; + // We can close down now. + DISTRIBUTER::instance ()->done (1); return 0; } |