bos #26457 Factorization of ORB initialization

[modules/kernel.git] / src / Notification / NOTIFICATION.cxx

diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx
index faf68661b7658a1cdfc6f257622a653c4d333515..68ae08b8d0473faf2f07dbec239d746ea48f7f41 100644 (file)
--- a/src/Notification/NOTIFICATION.cxx
+++ b/src/Notification/NOTIFICATION.cxx
@@ -27,12 +27,10 @@
 //
 #include "NOTIFICATION.hxx"
 
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
 
 CosNA_EventChannel_ptr NOTIFICATION_channel() {
-    ORB_INIT&      init = *SINGLETON_<ORB_INIT>::Instance(); ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
-    CORBA::ORB_ptr orb  = init(0, 0);
+    CORBA::ORB_ptr orb  = KERNEL::GetRefToORB();
 
     CosNA_EventChannel_ptr       channel = CosNA_EventChannel::_nil();
     CosNaming::NamingContext_var name_context;