diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp')
-rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp index a2ee9263b1f..65c80374a6b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp @@ -12,26 +12,22 @@ #include "ORB_Holder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Holder, +ACE_RCSID (TAO_PERF_RTEC, + ORB_Holder, "$Id$") ORB_Holder::ORB_Holder (int &argc, char *argv[], - const char *orb_id - ACE_ENV_ARG_DECL) - : orb_ (CORBA::ORB_init (argc, argv, orb_id - ACE_ENV_ARG_PARAMETER)) + const char *orb_id) + : orb_ (CORBA::ORB_init (argc, argv, orb_id)) { } ORB_Holder::~ORB_Holder (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } ACE_CATCH (CORBA::Exception, ex) { + try{ + this->orb_->destroy (); + } catch (const CORBA::Exception&) { // @@ TODO Log this event, check the Servant_var.cpp comments for // details. - } ACE_ENDTRY; + } } |