[openrtm-commit:02577] r2982 - trunk/OpenRTM-aist/src/lib/rtm
openrtm @ openrtm.org
openrtm @ openrtm.org
2017年 4月 14日 (金) 18:31:34 JST
Author: n-ando
Date: 2017-04-14 18:31:34 +0900 (Fri, 14 Apr 2017)
New Revision: 2982
Modified:
trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
Log:
[compat,bugfix] A bug that INSManager created only in master manager has been fixed.
Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-04-14 09:09:03 UTC (rev 2981)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-04-14 09:31:34 UTC (rev 2982)
@@ -38,19 +38,18 @@
{
rtclog.setName("ManagerServant");
coil::Properties config(m_mgr.getConfig());
-
+
+ if (!createINSManager())
+ {
+ RTC_WARN(("Manager CORBA servant creation failed."));
+ return;
+ }
+ RTC_WARN(("Manager CORBA servant was successfully created."));
+
if (coil::toBool(config["manager.is_master"], "YES", "NO", true))
{ // this is master manager
RTC_TRACE(("This manager is master."));
-
- if (!createINSManager())
- {
- RTC_WARN(("Manager CORBA servant creation failed."));
- return;
-
- }
m_isMaster = true;
- RTC_WARN(("Manager CORBA servant was successfully created."));
return;
}
else
openrtm-commit メーリングリストの案内