1 files changed, 9 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
index be8576f9f98..5d396e84fd3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
@@ -6,16 +6,21 @@
 ACE_INLINE
 TAO_SSL_State_Guard::TAO_SSL_State_Guard (
   TAO_SSLIOP_Connection_Handler *handler,
-  TAO_ORB_Core *orb_core,
   int &result)
-  : handler_ (handler)
+  : handler_ (handler),
+    previous_current_impl_ (0),
+    current_impl_ (),
+    setup_done_ (0)
 {
   // Set up the SSLIOP::Current object.
-  result = this->handler_->setup_ssl_state (orb_core);
+  result = this->handler_->setup_ssl_state (this->previous_current_impl_,
+                                            &(this->current_impl_),
+                                            this->setup_done_);
 }
 
 ACE_INLINE
 TAO_SSL_State_Guard::~TAO_SSL_State_Guard (void)
 {
-  this->handler_->teardown_ssl_state ();
+  this->handler_->teardown_ssl_state (this->previous_current_impl_,
+                                      this->setup_done_);
 }