ChangeLogTag: Thu Jun 16 06:06:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 22 insertions, 3 deletions

diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c9003e48023..fc7d3f1937b 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -19,6 +19,19 @@ TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
 {
 }
 
+int
+TAO::ORBInitializer_Registry::fini (void)
+{
+  // Release all initializers in the array
+  size_t const initializer_count (this->initializers_.size ());
+  for (size_t i = 0; i < initializer_count; ++i)
+    {
+      CORBA::release (this->initializers_[i]);
+    }
+
+  return 0;
+}
+
 void
 TAO::ORBInitializer_Registry::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 33cd3099e72..73e070d9c79 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -44,6 +44,10 @@ namespace TAO
     public:
       ORBInitializer_Registry (void);
 
+      /// Service config fini method, release all ORBInitializers at this
+      /// moment
+      virtual int fini (void);
+
       /// Register an ORBInitializer with the underlying ORBInitializer
       /// array.
       virtual void register_orb_initializer (
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index 6e7f8c4c02b..2e6cb46d18e 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver {
+project(*Server): taoserver, messaging {
   Source_Files {
     Clock_Ticks.cpp
     Server_Peer.cpp
@@ -9,13 +9,15 @@ project(*Server): messaging, taoexe, portableserver {
   }
 }
 
-project(*Scavenger): messaging, taoexe, portableserver {
+project(*Scavenger): taoserver, messaging {
+  exename = scavanger
   Source_Files {
     scavenger.cpp
   }
 }
 
-project(*Client): messaging, taoexe, portableserver {
+project(*Client): taoserver, messaging {
+  exename = client
   Source_Files {
     Clock_Ticks.cpp
     Client_Peer.cpp