*** empty log message ***

3 files changed, 7 insertions, 0 deletions

diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 57cef845384..5e8460e4300 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -574,6 +574,11 @@ template <class SH, PR_CO_1> int
 ACE_Connector<SH, PR_CO_2>::fini (void)
 {
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::fini");
+
+  // Make sure to call close here since our destructor might not be
+  // called if we're being dynamically linked via the svc.conf.
+  this->handler_map_.close ();
+
   // Make sure we call our handle_close(), not a subclass's!
   return ACE_Connector<SH, PR_CO_2>::handle_close ();
 }
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 153eb366b3f..6ec0aa8425a 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -30,6 +30,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
     (void) ACE_OS::memcpy ((void *) &this->filename_,
                            (void *) &sa.filename_,
                            sa.get_size ());
+  return 0;
 }
 
 // Copy constructor.
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 82b0e6829dc..4edb38fc257 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -66,6 +66,7 @@ ACE_SPIPE_Addr::set (const ACE_SPIPE_Addr &sa)
     (void) ACE_OS::memcpy ((void *) &this->SPIPE_addr_, (void *)
                            &sa.SPIPE_addr_,
                            sa.get_size ()); 
+  return 0;
 }
 
 // Copy constructor.