[openrtm-commit:03270] r3255 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2018-03-23 16:19:41 +0900 (Fri, 23 Mar 2018)
New Revision: 3255

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
Log:
[compat,bugfix] Fixed the bug. refs #4489

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2018-03-22 04:47:28 UTC (rev 3254)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2018-03-23 07:19:41 UTC (rev 3255)
@@ -88,6 +88,7 @@
     "manager.components.naming_policy",      "process_unique",
     "manager.command",                       "rtcd",
     "manager.nameservers",                     "default",
+    "manager.language",                      "C++",
     "manager.supported_languages",           "C++, Python, Java",
     "manager.modules.C++.manager_cmd",       "rtcd",
     "manager.modules.C++.profile_cmd",       "rtcprof",

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp	2018-03-22 04:47:28 UTC (rev 3254)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp	2018-03-23 07:19:41 UTC (rev 3255)
@@ -1164,7 +1164,6 @@
     CompParam comp_param(create_arg);
 
     // detect languange
-    //std::string lang = param["language"];
     std::string lang = comp_param.language();
     if (lang.empty()) { lang = "C++"; }
 
@@ -1323,8 +1322,10 @@
         return RTC::RTObject::_nil();
       }
 
+    CompParam comp_param(create_arg);
+
     // detect languange
-    std::string lang = param["language"];
+    std::string lang = comp_param.language();
     if (lang.empty()) { lang = "C++"; }
     RTC_INFO(("Specified manager's language: %s", lang.c_str()));