ChangeLogTag: Mon Jan 16 14:17:47 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 28 insertions, 16 deletions

diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index e8af8eae8f4..fc049b4c626 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -103,7 +103,8 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       // Scheduler populates the service context with
       // scheduling parameters.
-      current->scheduler ()->send_request (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_request (ri);
 
       // If this is a one way request
       if (!ri->response_expected ())
@@ -132,8 +133,10 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
-      current->scheduler ()->send_poll (ri);
-
+      {
+        RTScheduling::Scheduler_var scheduler = current->scheduler ();
+        scheduler->send_poll (ri);
+      }
 }
 
 void
@@ -151,7 +154,10 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    current->scheduler ()->receive_reply (ri);
+    {
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->receive_reply (ri);
+    }
 }
 
 void
@@ -214,7 +220,8 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         {
           // Inform scheduler that exception was
           // received.
-          current->scheduler ()->receive_exception (ri);
+          RTScheduling::Scheduler_var scheduler = current->scheduler ();
+          scheduler->receive_exception (ri);
         }
     }
 }
@@ -235,8 +242,10 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    current->scheduler ()->receive_other (ri);
-
+    {
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->receive_other (ri);
+    }
 }
 
 char*
@@ -324,11 +333,12 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Scheduler retrieves scheduling parameters
   // from request and populates the out
   // parameters.
-  new_current->scheduler()->receive_request (ri,
-                                             guid_var.out (),
-                                             name,
-                                             sched_param,
-                                             implicit_sched_param);
+  RTScheduling::Scheduler_var scheduler = new_current->scheduler();
+  scheduler->receive_request (ri,
+                              guid_var.out (),
+                              name,
+                              sched_param,
+                              implicit_sched_param);
 
   if (guid_var.in () == 0)
     {
@@ -410,8 +420,8 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
 
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_reply (ri
-                                         ACE_ENV_ARG_PARAMETER);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       current->cleanup_DT ();
@@ -449,7 +459,8 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_exception (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_exception (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -474,7 +485,8 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_other (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_other (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();