summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp25
1 files changed, 8 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index d72b4869017..2ae4d2713c8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,9 +1,7 @@
-// -*- C++ -*-
-
#include "SSLIOP_Util.h"
-ACE_RCSID (TAO_SSLIOP,
+ACE_RCSID (SSLIOP,
SSLIOP_Util,
"$Id$")
@@ -16,9 +14,10 @@ ACE_RCSID (TAO_SSLIOP,
int
-TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
- TAO_IIOP_Properties *tcp_properties,
- TAO_SSLIOP_Connection_Handler_State &s)
+TAO::SSLIOP::Util::setup_handler_state (
+ TAO_ORB_Core *orb_core,
+ TAO_IIOP_Properties *tcp_properties,
+ TAO::SSLIOP::Connection_Handler_State &s)
{
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
@@ -33,17 +32,9 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- SSLIOP::Current_var current =
- SSLIOP::Current::_narrow (obj.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (CORBA::is_nil (current.in ()))
- ACE_TRY_THROW (CORBA::INV_OBJREF ());
-
- TAO_SSLIOP_Current_var tao_current =
- TAO_SSLIOP_Current::_narrow (current.in ()
- ACE_ENV_ARG_PARAMETER);
+ TAO::SSLIOP::Current_var tao_current =
+ TAO::SSLIOP::Current::_narrow (obj.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (tao_current.in ()))