Removed shutdown flags. Servers do not shutdown after every call in IR

mode anymore.

4 files changed, 1 insertions, 25 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index c10222a91a0..b2178a15387 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -8,7 +8,6 @@ ACE_RCSID(ImplRepo, airplane_i, "$Id$")
 // Constructor
 
 Airplane_i::Airplane_i (int shutdown)
-: shutdown_ (shutdown)
 {
   // Seed the random number generator
   // Note: This server should not be run with thread-per-request since the seeding
@@ -36,9 +35,6 @@ Airplane_i::get_plane (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
   
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
   switch (ACE_OS::rand () % 24)
     {
     case 0:
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index c740b5039ea..14893908c6d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -53,10 +53,6 @@ public:
   virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a random plane.
-
-private:
-  int shutdown_;
-  // Shutdown flag
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 527111ef28b..ce271de0308 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -11,8 +11,7 @@ ACE_RCSID(ImplRepo, nestea_i, "$Id$")
 // Constructor
 
 Nestea_i::Nestea_i (const char *filename, int shutdown)
-: shutdown_ (shutdown),
-  cans_ (0)
+: cans_ (0)
 {
   this->data_filename_ = ACE::strnew (filename);
   
@@ -43,9 +42,6 @@ Nestea_i::drink (CORBA::Long cans,
 
   this->cans_ += cans;
 
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
   this->save_data ();
 }
 
@@ -67,9 +63,6 @@ Nestea_i::crush (CORBA::Long cans,
   else
     this->cans_ -= cans;
   
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
   this->save_data ();
 }
 
@@ -85,9 +78,6 @@ Nestea_i::bookshelf_size (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
 
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
   return this->cans_;
 }
 
@@ -102,9 +92,6 @@ Nestea_i::get_praise (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
 
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
   if (this->cans_ > 500)
     return CORBA::string_dup ("Man, that is one excellent Nestea Collection!");
   else if (this->cans_ > 250)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 51aa465f0ac..c4b37a901d6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -78,9 +78,6 @@ private:
   char *data_filename_;
   // The name of the file to store the data in.
 
-  int shutdown_;
-  // Shutdown flag.
-
   ACE_UINT32 cans_;
   // Number of cans in the bookshelf.
 };