summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-12-29 22:48:42 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-12-29 22:48:42 +0000
commit95f64ccae639ef3d32d64429f6f3caf1865333c8 (patch)
treeda4a8851f193a26afd7cac5e9d4b3526588c5040 /TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
parent9e20f36053f9d7151739599f1595679643dc1e29 (diff)
downloadATCD-95f64ccae639ef3d32d64429f6f3caf1865333c8.tar.gz
ChangeLogTag:Tue Dec 29 14:29:22 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 20ebb969b38..87a92dfd455 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -2124,16 +2124,22 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* arg)
ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE);
if (this->receiving_events ())
{
- CORBA::Environment __env;
- ACE_Time_Value tv = ACE_OS::gettimeofday ();
- ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv);
- correlation_->correlation_module_->push (this,
- this->timeout_event_,
- __env);
- if (__env.exception () != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "ACE_ES_Consumer_Rep_Timeout::execute: "
- "unexpected exception.\n"), -1);
+ TAO_TRY
+ {
+ ACE_Time_Value tv = ACE_OS::gettimeofday ();
+ ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv);
+ correlation_->correlation_module_->push (this,
+ this->timeout_event_,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ }
+ TAO_CATCH (CORBA::Exception, ex)
+ {
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "ACE_ES_Consumer_Rep_Timeout::execute: "
+ "unexpected exception.\n"), -1);
+ }
+ TAO_ENDTRY;
}
return 0;
}