1 files changed, 65 insertions, 0 deletions
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 919abb2706e..57834a96e38 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,6 +1,7 @@
 #include "tao/PI/ORBInitializer_Registry_Impl.h"
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/PI/PICurrent.h"
+#include "tao/PI/PI_ORBInitializer.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
@@ -10,6 +11,10 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Log_Msg.h"
 
+#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h"
+#include "tao/PI/PICurrent_Loader.h"
+#include "tao/PI/PolicyFactory_Loader.h"
+
 ACE_RCSID (PI,
            ORBInitializer_Registry,
            "$Id$")
@@ -24,6 +29,66 @@ TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
 }
 
 int
+TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
+                    guard,
+                    this->lock_,
+                    -1);
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+  ACE_Service_Config::process_directive
+    (ace_svc_desc_TAO_PolicyFactory_Loader);
+
+  ACE_Service_Config::process_directive
+    (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl);
+
+  ACE_Service_Config::process_directive
+    (ace_svc_desc_TAO_PICurrent_Loader);
+
+  PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
+    PortableInterceptor::ORBInitializer::_nil ();
+
+  PortableInterceptor::ORBInitializer_var orb_initializer;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      /// Register the PI ORBInitializer.
+
+      ACE_NEW_THROW_EX (temp_orb_initializer,
+                        TAO_PI_ORBInitializer,
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO::VMCID,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
+      ACE_TRY_CHECK;
+
+      orb_initializer = temp_orb_initializer;
+
+      this->register_orb_initializer (orb_initializer.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "(%P | %t) Caught exception:");
+        }
+      return -1;
+    }
+  ACE_ENDTRY;
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+  return 0;
+}
+
+
+int
 TAO::ORBInitializer_Registry::fini (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,