*** empty log message ***

2 files changed, 6 insertions, 11 deletions

diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index dc67f4ef5ed..7c140b7fcdd 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -637,13 +637,8 @@ CORBA::ORB_init (int &argc,
 
   env.clear ();
 
-  // @@ We need to make sure it's ok for the following 3
-  // initialization routines to be called multiple times.  Or better
-  // yet, ensure that we just call them the first time, e.g., by
-  // putting them in some type of TAO_Object_Manager, along with the
-  // Typecode_Constants...
-
-  CORBA_ORB::init_orb_globals ();
+  // Make sure initialization of TAO globals only occurs once.
+  CORBA_ORB::init_orb_globals (env);
 
   if (env.exception () != 0)
     return 0;
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 9925cbbe9b2..fc82323f37e 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -872,6 +872,10 @@ public:
   // previously-specified port for requests.  Returns -1 on failure,
   // else 0.
 
+  static void init_orb_globals (CORBA::Environment &env);
+  // Initialize the ORB globals correctly, i.e., only when they
+  // haven't been initialized yet.
+
 protected:
   // We must be created via the <ORB_init> call.
   CORBA_ORB (void);
@@ -921,10 +925,6 @@ private:
   // If this is non-_nil(), then this is the object reference to our
   // configured Trading.
 
-  static void init_orb_globals (CORBA::Environment &env);
-  // Initialize the ORB globals correctly, i.e., only when they
-  // haven't been initialized yet.
-
   static int orb_init_count_;
   // Count of the number of times that <ORB_init> has been called.
   // This must be protected by <ACE_Static_Object_Lock>.