diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-11-26 23:48:33 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-11-26 23:48:33 +0000 |
| commit | e18cc68d91df8ed299e3ad5de11e4cbb745ab44d (patch) | |
| tree | 22fc58b5fefd3bcd8eb94b8366f21ba7bcf5c3f7 | |
| parent | 0aaca0de46257b77fa4ea68257c31396341980cc (diff) | |
| download | ATCD-e18cc68d91df8ed299e3ad5de11e4cbb745ab44d.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index f16ee092955..fb84d090096 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -440,6 +440,8 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( ACE_CHECK; proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; + + TAO_FTRTEC::TimeLogger::output(); } void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 78f82c42b3d..77f2dfd5bc6 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -158,16 +158,21 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value ¤t_time, event[0].data.any_value <<= seq_no_; bool final = (num_iterations_ == (int) seq_no_++); + ACE_DECLARE_NEW_CORBA_ENV ; + ACE_TRY_NEW_ENV { if (!final) { consumer_->push(event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { + consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + ACE_CString ior("file://"); ior += proxy_consumer_file_; CORBA::Object_var obj = orb_->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK RtecEventComm::PushConsumer_var consumer = RtecEventComm::PushConsumer::_narrow(obj.in()); ACE_OS::sleep(1); |