1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index 20845593237..5de9b828787 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -50,6 +50,10 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler)
                                    reset_new_handle  // reset new handler
                                    ) == -1)
     {
+      // Ensure that errno is preserved in case the svc_handler
+      // close() method resets it.
+      ACE_Errno_Guard error (errno);
+
       // Close down handler to avoid memory leaks.
       svc_handler->close (0);