ChangeLogTag:Tue Apr 17 21:21:06 2001 Nanbor Wang <nanbor@cs.wustl.edu>

7 files changed, 48 insertions, 11 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2baf70fa9f6..23759581cb5 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Tue Apr 17 21:21:06 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/Collocation/Coll_Tester.cpp:
+	* tests/Collocation/Coll_Tester.h: Added shutdown method to
+	  destroy the RootPOA and the ORB.  The lack of it was causing the
+	  test to crash.
+
+	* tests/Collocation/Collocation.dsw: Redefined project
+	  dependencies.
+
+	* tests/Collocation/Makefile.test:
+	* tests/Collocation/Collocation.cpp:
+	* tests/Collocation/main.cpp:
+	* tests/Collocation/Collocation.dsp: Renamed <main.cpp> to
+	  <Collocation.cpp> so that both Win32 and UNIX build the same
+	  executable.
+
+	  Thanks to Carlos for pointing them out.
+
 Tue Apr 17 15:48:20 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tao/IIOP_Connection_Handler.cpp (handle_close):
diff --git a/TAO/tests/Collocation/Coll_Tester.cpp b/TAO/tests/Collocation/Coll_Tester.cpp
index 7e687b28019..26c220166de 100644
--- a/TAO/tests/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Collocation/Coll_Tester.cpp
@@ -20,6 +20,15 @@ Collocation_Test::Collocation_Test (void)
   // no-op.
 }
 
+void
+Collocation_Test::shutdown (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->root_poa_->destroy (1, 1, ACE_TRY_ENV);
+  ACE_CHECK;
+  this->orb_->destroy (ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
 int
 Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 {
diff --git a/TAO/tests/Collocation/Coll_Tester.h b/TAO/tests/Collocation/Coll_Tester.h
index 0912feb048f..584710a098a 100644
--- a/TAO/tests/Collocation/Coll_Tester.h
+++ b/TAO/tests/Collocation/Coll_Tester.h
@@ -29,6 +29,8 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
+  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+
   int init (int argc, char *argv[], CORBA::Environment &);
   // Initializing the Collocation_Test object.
 
diff --git a/TAO/tests/Collocation/main.cpp b/TAO/tests/Collocation/Collocation.cpp
index 84ce376b7fc..b61625d0c6f 100644
--- a/TAO/tests/Collocation/main.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -8,15 +8,18 @@ ACE_RCSID(Collocation, main, "$Id$")
 
 int main (int argc, char *argv[])
 {
-  Collocation_Test coll_test;
-
   ACE_TRY_NEW_ENV
     {
+      Collocation_Test coll_test;
+
       coll_test.init (argc, argv, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       coll_test.run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      coll_test.shutdown (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Collocation/Collocation.dsp b/TAO/tests/Collocation/Collocation.dsp
index d8ce78d5094..cb78ce9f185 100644
--- a/TAO/tests/Collocation/Collocation.dsp
+++ b/TAO/tests/Collocation/Collocation.dsp
@@ -93,7 +93,7 @@ SOURCE=.\Coll_Tester.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\main.cpp

+SOURCE=.\Collocation.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tests/Collocation/Collocation.dsw b/TAO/tests/Collocation/Collocation.dsw
index d43488c0151..d4f2e11a3eb 100644
--- a/TAO/tests/Collocation/Collocation.dsw
+++ b/TAO/tests/Collocation/Collocation.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Diamond"=.\Diamond.dsp - Package Owner=<4>

+Project: "Coll_Test_Stubs DLL"=.\Coll_Test_Stubs.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -11,14 +11,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name Coll_Test_Stubs

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "Coll_Test_Stubs"=.\Coll_Test_Stubs.dsp - Package Owner=<4>

+Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -26,11 +23,17 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name Diamond

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Diamond DLL

+    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>

+Project: "Diamond DLL"=.\Diamond.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +42,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name Diamond

+    Project_Dep_Name Coll_Test_Stubs DLL

     End Project Dependency

 }}}

 

@@ -56,3 +59,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+

diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test
index c5b79138535..7783e68fa5c 100644
--- a/TAO/tests/Collocation/Makefile.test
+++ b/TAO/tests/Collocation/Makefile.test
@@ -20,7 +20,7 @@ LDLIBS = -lCollocation_Test_Stub \
 
 SRC = Coll_Tester.cpp
 
-BIN = main
+BIN = Collocation
 
 #----------------------------------------------------------------------------
 #       Include macros and targets