summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index fb9a61ba32b..bd27221202e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "IIOP_SSL_Connection_Handler.h"
+#include "IIOP_SSL_Transport.h"
+#include "SSLIOP_Connection_Handler.h"
#include "tao/Timeprobe.h"
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
@@ -13,12 +13,12 @@ ACE_RCSID (SSLIOP,
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
+#include "IIOP_SSL_Connection_Handler.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_ENABLE_TIMEPROBES)
-static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
+static const char *TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
{
"IIOP_SSL_Connection_Handler::handle_input - start",
"IIOP_SSL_Connection_Handler::handle_input - end",
@@ -50,8 +50,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_SSL_Connect_Timeprobe_Description,
#endif /* ACE_ENABLE_TIMEPROBES */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
ACE_Thread_Manager *t)
: TAO_IIOP_Connection_Handler (t)
@@ -70,15 +68,15 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
CORBA::Boolean /* flag */)
: TAO_IIOP_Connection_Handler (orb_core, 0)
{
- // Delete the transport with TAO_IIOP_Connection_Handler.
- delete this->transport ();
-
IIOP_SSL_Transport* specific_transport = 0;
ACE_NEW (specific_transport,
IIOP_SSL_Transport (this,
orb_core,
0));
+ // Delete the transport with TAO_IIOP_Connection_Handler.
+ delete this->transport ();
+
// store this pointer
this->transport (specific_transport);
}
@@ -87,4 +85,4 @@ TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void)
{
}
-TAO_END_VERSIONED_NAMESPACE_DECL
+// ****************************************************************