[openrtm-commit:03068] r3163 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-17 10:59:19 +0900 (Wed, 17 Jan 2018)
New Revision: 3163

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat,->RELENG_1_2] refs #3273

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-01-17 01:42:25 UTC (rev 3162)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-01-17 01:59:19 UTC (rev 3163)
@@ -66,6 +66,8 @@
 	ModuleManager.cpp            \
 	NamingManager.cpp            \
 	NumberingPolicy.cpp          \
+	NodeNumberingPolicy.cpp          \
+	NamingServiceNumberingPolicy.cpp          \
 	ManagerServant.cpp           \
 	SystemLogger.cpp             \
 	LogstreamFile.cpp               \
@@ -162,7 +164,9 @@
 	ExecutionContextBase.h 	 \
 	InPort.h 		 \
 	InPortConsumer.h 	 \
-	NumberingPolicyBase.h \
+	NumberingPolicyBase.h    \
+	NamingServiceNumberingPolicy.h    \
+	NodeNumberingPolicy.h    \
 	ObjectManager.h 	 \
 	OutPort.h 		 \
 	OutPortConsumer.h 	 \
@@ -175,7 +179,7 @@
 	SdoServiceConsumerBase.h \
 	StateMachine.h 		 \
 	Typename.h               \
-	Timestamp.h			\
+	Timestamp.h		 \
 	LocalServiceBase.h	 \
 	LogstreamBase.h      \
 	ListenerHolder.h         \

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-17 01:42:25 UTC (rev 3162)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-17 01:59:19 UTC (rev 3163)
@@ -857,6 +857,30 @@
       }
     m_listeners.naming_.postBind(comp, names);
 
+
+	try
+	{
+		CORBA::Object_ptr obj = theORB()->resolve_initial_references("omniINSPOA");
+		PortableServer::POA_ptr poa = PortableServer::POA::_narrow(obj);
+		poa->the_POAManager()->activate();
+
+		std::string id_str = comp->getCategory();
+		id_str = id_str + "/" + comp->getInstanceName();
+
+		PortableServer::ObjectId_var id;
+#ifndef ORB_IS_RTORB
+		id = PortableServer::string_to_ObjectId(id_str.c_str());
+#else // ORB_IS_RTORB
+		id = PortableServer::
+			string_to_ObjectId((char *)id_str.c_str());
+#endif // ORB_IS_RTORB
+
+		poa->activate_object_with_id(id.in(), comp);
+	}
+	catch (...)
+	{
+	}
+
     return true;
   }