Sat Jan 18 00:16:14 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>

        * orbsvcs/DevGuideExamples/ImplRepo/run_test.pl:
          Fix the order of termination of activator & locator.

        * orbsvcs/ImplRepo_Service/LiveCheck.h:
        * orbsvcs/ImplRepo_Service/LiveCheck.cpp:
          Fix various valgrind reported errors including a memory leak
          related to per-client activations and invalid memory access.

1 files changed, 6 insertions, 6 deletions

diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
index ee1463141af..b3ce3cd907f 100755
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
@@ -246,6 +246,12 @@ if ($SDN_status != 0) {
     exit 1;
 }
 
+$ACT_status = $ACT->TerminateWaitKill ($act->ProcessStopWaitInterval());
+
+if ($ACT_status != 0) {
+    print STDERR "ERROR: ImR_Activator returned $ACT_status\n";
+    $status = 1;
+}
 
 $IR_status = $IR->TerminateWaitKill ($imr->ProcessStopWaitInterval());
 
@@ -254,12 +260,6 @@ if ($IR_status != 0) {
     $status = 1;
 }
 
-$ACT_status = $ACT->TerminateWaitKill ($act->ProcessStopWaitInterval());
-
-if ($ACT_status != 0) {
-    print STDERR "ERROR: ImR_Activator returned $ACT_status\n";
-    $status = 1;
-}
 
 $imr->DeleteFile ($implrepo_ior);
 $act->DeleteFile ($implrepo_ior);