summaryrefslogtreecommitdiff
path: root/TAO/tao/CSD_Framework/CSD_Object_Adapter.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/CSD_Framework/CSD_Object_Adapter.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/CSD_Framework/CSD_Object_Adapter.cpp')
-rw-r--r--TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index ed74e7c413b..3b4d70b0b43 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -15,7 +15,7 @@ TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
TAO_ORB_Core &orb_core)
: TAO_Object_Adapter (creation_parameters, orb_core)
{
-
+
}
TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter ()
@@ -26,20 +26,19 @@ void
TAO_CSD_Object_Adapter::do_dispatch (
TAO_ServerRequest& req,
TAO::Portable_Server::Servant_Upcall& upcall
- ACE_ENV_ARG_DECL)
+ )
{
TAO_Root_POA& poa = upcall.poa ();
TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa);
-
+
if (csd_poa == 0)
{
- ACE_THROW (CORBA::BAD_PARAM ());
+ throw ( ::CORBA::BAD_PARAM ());
}
TAO::CSD::Strategy_Proxy& proxy
= csd_poa->servant_dispatching_strategy_proxy ();
- proxy.dispatch_request (req, upcall ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ proxy.dispatch_request (req, upcall);
}
TAO_END_VERSIONED_NAMESPACE_DECL