Thu Apr 25 18:42:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

5 files changed, 24 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 08534a1ae00..28b08a70c56 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Apr 25 18:42:02 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+
+        * tao/IORTable/Async_Table_Adapter.cpp:
+        * tao/IORTable/Locate_ResponseHandler.cpp:
+
+          Scoreboard cleanup.
+
 Wed Apr 24 14:45:54 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/tao_imr_i.h:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index cd49caaa756..ded0b6cbcde 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -88,8 +88,9 @@ ImR_DSI_Forwarder::_dispatch (TAO_ServerRequest &request,
            CORBA::ServerRequest (request));
   try
     {
-      TAO_AMH_DSI_Response_Handler_var rh;
-      ACE_NEW (rh, TAO_AMH_DSI_Response_Handler(request));
+      TAO_AMH_DSI_Response_Handler_ptr rhp;
+      ACE_NEW (rhp, TAO_AMH_DSI_Response_Handler(request));
+      TAO_AMH_DSI_Response_Handler_var rh(rhp);
 
       rh->init (request, 0);
       // Delegate to user.
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 08a256501c5..041f8c90df1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -944,7 +944,7 @@ ImR_Locator_i::server_is_running
           return;
         }
 
-      this->pinger_.add_server (name.c_str(), this->ping_external_, s);
+      this->pinger_.add_server (name.c_str(), this->ping_external_, s.in());
       AsyncAccessManager *aam_raw;
       ACE_NEW (aam_raw, AsyncAccessManager (*temp_info, true, *this));
       AsyncAccessManager_ptr aam (aam_raw);
@@ -970,12 +970,12 @@ ImR_Locator_i::server_is_running
           info.edit ()->server = s;
 
           info.update_repo();
-          this->pinger_.add_server (name.c_str(), true, s);
+          this->pinger_.add_server (name.c_str(), true, s.in());
         }
 
       AsyncAccessManager_ptr aam(this->find_aam (name.c_str()));
       if (*aam != 0)
-        aam->server_is_running (partial_ior, s);
+        aam->server_is_running (partial_ior, s.in());
       else
         {
           if (info->activation_mode != ImplementationRepository::PER_CLIENT)
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp
index 6462696a006..bce713089a2 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp
@@ -64,8 +64,11 @@ TAO_Async_Table_Adapter::dispatch (TAO::ObjectKey &key,
   if (this->root_->async_available ())
     {
       // construct a callback handler
-      TAO_AMH_Locate_ResponseHandler_var rh;
-      ACE_NEW_RETURN (rh, TAO_AMH_Locate_ResponseHandler (request), DS_MISMATCHED_KEY);
+      TAO_AMH_Locate_ResponseHandler_ptr rhp;
+      ACE_NEW_RETURN (rhp,
+                      TAO_AMH_Locate_ResponseHandler (request),
+                      DS_MISMATCHED_KEY);
+      TAO_AMH_Locate_ResponseHandler_var rh (rhp);
       this->find_object (rh, key);
       return 0;
     }
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index cf36cae1ef2..d307539ad06 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -52,10 +52,11 @@ TAO_AMH_Locate_ResponseHandler::raise_excep (const CORBA::Exception &ex)
 }
 
 void
-TAO_AMH_Locate_ResponseHandler::forward_ior (const char *ior, CORBA::Boolean is_perm)
+TAO_AMH_Locate_ResponseHandler::forward_ior (const char *ior,
+                                             CORBA::Boolean is_perm)
 {
   CORBA::Object_var fwd = this->orb_->string_to_object (ior);
-  this->_tao_rh_send_location_forward (fwd, is_perm);
+  this->_tao_rh_send_location_forward (fwd.in(), is_perm);
 }