summaryrefslogtreecommitdiff
path: root/TAO/tao/Utils/ORB_Destroyer.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 13:42:44 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 13:42:44 +0000
commit1ce4bfe566cacc77785f53a0133d4c40f1d4146b (patch)
tree847cc2e50062a205e1c6b9d74eafe66e135e9b73 /TAO/tao/Utils/ORB_Destroyer.cpp
parent58c2d4f3d71d8c8258a9e659a37ca03e5f4bc5cf (diff)
downloadATCD-1ce4bfe566cacc77785f53a0133d4c40f1d4146b.tar.gz
Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Utils/ORB_Destroyer.cpp')
-rw-r--r--TAO/tao/Utils/ORB_Destroyer.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 8b8a74220ff..f21bef3f86d 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -11,17 +11,14 @@ void
TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
ACE_THROW_SPEC (())
{
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ try
{
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
- ACE_CATCHALL
+ catch (...)
{
// @@ Cannot let exceptions escape, yet we need to log them!
}
- ACE_ENDTRY;
}
TAO_END_VERSIONED_NAMESPACE_DECL