Added comments.

1 files changed, 10 insertions, 8 deletions

diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 4d7ca3138b3..17d9881abdd 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1172,6 +1172,16 @@ CORBA::ORB_init (int &argc,
   // Initialize the ORB Core instance.
   int result = oc->init (argc, (char **) argv);
 
+  env.clear ();
+
+  // This (init_orb_globals) must come *after* ORB Core initialization.
+  // Make sure initialization of TAO globals only occurs once.
+  CORBA_ORB::init_orb_globals (env);
+
+  if (env.exception () != 0)
+    return 0;
+
+  // This must come *after* (init_orb_globals).
   if (sizeof (CORBA::Short) != 2
       || sizeof (CORBA::Long) != 4
       || sizeof (CORBA::LongLong) != 8
@@ -1199,14 +1209,6 @@ CORBA::ORB_init (int &argc,
       return 0;
     }
 
-  env.clear ();
-
-  // Make sure initialization of TAO globals only occurs once.
-  CORBA_ORB::init_orb_globals (env);
-
-  if (env.exception () != 0)
-    return 0;
-
   // Check for errors and return 0 if error.
   if (result == -1)
     {