Wed Mar 17 13:44:06 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * tao/RTScheduling/Request_Interceptor.cpp:
        * tao/RTScheduling/RTScheduler_Manager.inl:
        * tao/RTScheduling/Current.cpp:
        * tao/RTScheduling/Current.h:
        * tao/RTScheduling/RTScheduler_Initializer.cpp:
        * tao/RTScheduling/RTScheduler_Initializer.h:
          Fixed a number of memory leaks.

        * tests/RTScheduling/DT_Spawn/test.cpp:
        * tests/RTScheduling/DT_Spawn/Thread_Action.h:
        * tests/RTScheduling/Scheduler.cpp:
        * tests/RTScheduling/Current/Thread_Task.cpp:
        * tests/RTScheduling/Scheduling_Interceptor/test_server.cpp:
        * tests/RTScheduling/VoidData/test_client.cpp:
        * tests/RTScheduling/Thread_Cancel/Thread_Task.h:
        * tests/RTScheduling/Thread_Cancel/test.cpp:
        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp:
        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp:
        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp:
        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
        * examples/RTScheduling/Thread_Task.h:
        * examples/RTScheduling/POA_Holder.cpp:
        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp:
        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h:
        * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp:
        * examples/RTScheduling/Fixed_Priority_Scheduler/test.h:
        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp:
        * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl:
        * examples/RTScheduling/Job_i.cpp:
        * examples/RTScheduling/DT_Creator.cpp:
        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp:
        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h:
        * examples/RTScheduling/MIF_Scheduler/test.cpp:
        * examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp:
        * examples/RTScheduling/MIF_Scheduler/test.h:
        * examples/RTScheduling/MIF_Scheduler/run_test.pl:
        * examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp:
        * examples/RTScheduling/Thread_Task.cpp:
        * examples/RTScheduling/DT_Creator.h:
          Fixed a lot of memory leaks which are actually similar from test
          to test.

1 files changed, 6 insertions, 1 deletions

diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index fd07c9d8814..832769561a5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -142,6 +142,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
+      RTScheduling::Scheduler_var sched_owner;
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
@@ -165,7 +167,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (enable_dynamic_scheduling)
         {
           ACE_DEBUG ((LM_DEBUG, "Dyn Sched enabled\n"));
-          CORBA::Object_ptr manager_obj =
+          CORBA::Object_var manager_obj =
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
@@ -186,6 +188,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                          disp_impl_type,
                                          sched_policy,
                                          sched_scope), -1);
+          sched_owner = scheduler;
 
           manager->rtscheduler (scheduler);
 
@@ -249,6 +252,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       scheduler->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {