Tue Aug 28 18:42:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 19 insertions, 19 deletions

diff --git a/TAO/tests/Bug_1568_Regression/Test.idl b/TAO/tests/Bug_1568_Regression/Test.idl
index 288bf4aac97..4444065958c 100644
--- a/TAO/tests/Bug_1568_Regression/Test.idl
+++ b/TAO/tests/Bug_1568_Regression/Test.idl
@@ -14,7 +14,7 @@ module Foo
       void op1();
       void op2();
     };
-    
+
     interface B
     {
       void op3();
@@ -27,5 +27,6 @@ module Baz
   interface C : Foo::Bar::A, Foo::Bar::B
   {
     void op4();
+    oneway void shutdown ();
   };
 };
diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index a8e3a51235a..687b23cf0c2 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -69,6 +69,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       cobject->op2 ();
       cobject->op3 ();
       cobject->op4 ();
+      cobject->shutdown ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_1568_Regression/run_test.pl b/TAO/tests/Bug_1568_Regression/run_test.pl
index 90ae124d1c8..00df780d8ea 100755
--- a/TAO/tests/Bug_1568_Regression/run_test.pl
+++ b/TAO/tests/Bug_1568_Regression/run_test.pl
@@ -36,7 +36,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->TerminateWaitKill (10);
+$server = $SV->WaitKill (10);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index 4d693df7681..19bbf54db60 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -27,15 +27,11 @@ class Simple_C
 public:
   Simple_C (CORBA::ORB_ptr orb);
 
-  void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
-  void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
-  void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh);
-  void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh);
-
+  void op1 (Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
+  void op2 (Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
+  void op3 (Foo::Bar::AMH_BResponseHandler_ptr _tao_rh);
+  void op4 (Baz::AMH_CResponseHandler_ptr _tao_rh);
+  void shutdown (Baz::AMH_CResponseHandler_ptr _tao_rh);
 protected:
   CORBA::ORB_ptr orb_;
 };
@@ -50,33 +46,35 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_C::op1(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
+Simple_C::op1(Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
 {
   _tao_rh->op1();
 }
 
 void
-Simple_C::op2(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
+Simple_C::op2(Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
 {
   _tao_rh->op2();
 }
 
 void
-Simple_C::op3(
-    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
+Simple_C::op3(Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
 {
   _tao_rh->op3();
 }
 
 void
-Simple_C::op4(
-    Baz::AMH_CResponseHandler_ptr _tao_rh)
+Simple_C::op4(Baz::AMH_CResponseHandler_ptr _tao_rh)
 {
   _tao_rh->op4();
 }
 
+void
+Simple_C::shutdown (Baz::AMH_CResponseHandler_ptr)
+{
+  this->orb_->shutdown (0);
+}
+
 // ****************************************************************
 
 const char *ior_output_file = "test.ior";