ChangeLogTag:Thu Jul 12 17:30:42 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

1 files changed, 15 insertions, 4 deletions

diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 8cb59507ef7..95af7b321e0 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -19,6 +19,7 @@
 #include "StringSeqC.h"
 
 #include "Object_Loader.h"
+#include "ace/Dynamic_Service.h"
 
 #include "Default_Stub_Factory.h"
 #include "Default_Endpoint_Selector_Factory.h"
@@ -222,10 +223,20 @@ TAO_Internal::open_services_i (int &argc,
       int result = 0;
 
       if (skip_service_config_open == 0)
-        result = ACE_Service_Config::open (argc, argv,
-                                           ACE_DEFAULT_LOGGER_KEY,
-                                           0, // Don't ignore static services.
-                                           ignore_default_svc_conf_file);
+        {
+            result = ACE_Service_Config::open (argc, argv,
+                                               ACE_DEFAULT_LOGGER_KEY,
+                                               0, // Don't ignore static services.
+                                               ignore_default_svc_conf_file);
+        }
+
+      // Handle RTCORBA library special case.  Since RTCORBA needs
+      // its init method call to register several hooks, call it here
+      // if it hasn't already been called.
+      TAO_Object_Loader *rt_loader = 
+        ACE_Dynamic_Service<TAO_Object_Loader>::instance ("RT_ORB_Loader");
+      if (rt_loader != 0)
+          rt_loader->init (0, 0);
 
       // @@ What the heck do these things do and do we need to avoid
       // calling them if we're not invoking the svc.conf file?