[openrtm-commit:02478] r2954 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-02-22 14:59:04 +0900 (Wed, 22 Feb 2017)
New Revision: 2954

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat,->RELENG_1_2] refs #3881

Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2017-02-21 10:10:58 UTC (rev 2953)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2017-02-22 05:59:04 UTC (rev 2954)
@@ -106,6 +106,7 @@
     "manager.modules.Java.profile_cmd",      "rtcprof_java",
     "manager.modules.Java.suffixes",         "class",
     "manager.modules.Java.load_paths",       "./",
+    "manager.modules.search_auto",       "YES",
     "manager.local_service.enabled_services","ALL",
     "sdo.service.provider.enabled_service",  "ALL",
     "sdo.service.consumer.enabled_service",  "ALL",

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-02-21 10:10:58 UTC (rev 2953)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-02-22 05:59:04 UTC (rev 2954)
@@ -774,6 +774,10 @@
         RTC_ERROR(("Factory not found: %s",
                    comp_id["implementation_id"].c_str()));
         
+        if (!coil::toBool(m_config["manager.modules.search_auto"], "YES", "NO", true))
+          {
+            return 0;
+          }
         // automatic module loading
         std::vector<coil::Properties> mp(m_module->getLoadableModules());
         RTC_INFO(("%d loadable modules found", mp.size()));