[openrtm-commit:03079] r3167 - trunk/OpenRTM-aist/src/lib/rtm
openrtm @ openrtm.org
openrtm @ openrtm.org
2018年 1月 18日 (木) 23:09:27 JST
Author: miyamoto
Date: 2018-01-18 23:09:27 +0900 (Thu, 18 Jan 2018)
New Revision: 3167
Modified:
trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
Log:
[compat, bugfix, TAO] fixed bug.
Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2018-01-17 07:05:18 UTC (rev 3166)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2018-01-18 14:09:27 UTC (rev 3167)
@@ -858,13 +858,16 @@
*/
bool ManagerServant::createINSManager()
{
-#ifndef ORB_IS_TAO
try
{
//Ppreparing INS POA
CORBA::Object_var obj;
#ifndef ORB_IS_RTORB
+#ifndef ORB_IS_TAO
obj = m_mgr.theORB()->resolve_initial_references("omniINSPOA");
+#else
+ obj = m_mgr.theORB()->resolve_initial_references("RootPOA");
+#endif
#else // ROB_IS_RTORB
obj = m_mgr.theORB()->resolve_initial_references((char*)"omniINSPOA");
#endif // ORB_IS_RTORB
@@ -902,9 +905,6 @@
{
return false;
}
-#else
- m_objref = _this();
-#endif
return true;
}
More information about the openrtm-commit
mailing list