summaryrefslogtreecommitdiff
path: root/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp')
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
}
-void
+void
OrbShutdownTask::orb(CORBA::ORB_ptr orb)
{
this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
{
ACE_OS::sleep (2);
ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
- ACE_TRY_NEW_ENV
+ try
{
- this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->shutdown(0);
}
- ACE_CATCHALL
+ catch (...)
{
ACE_ERROR((LM_ERROR,
"(%P|%t) Exception raised by ORB::shutdown() call "
"in OrbShutdownTask::svc().\n"));
}
- ACE_ENDTRY;
return 0;
}