[openrtm-commit:02880] r1063 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-10-20 16:30:12 +0900 (Fri, 20 Oct 2017)
New Revision: 1063

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
[compat,newfunc->releng_1_2] Fixed the processing of onRateChanged callback. refs #4263

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2017-10-20 06:14:45 UTC (rev 1062)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2017-10-20 07:30:12 UTC (rev 1063)
@@ -76,6 +76,7 @@
         "manager.modules.C++.load_paths",     "./",
         "manager.modules.Python.load_paths",  "./",
         "manager.modules.Java.load_paths",    "./",
+        "manager.modules.search_auto",        "YES",
         "manager.supported_languages",        "C++, Python, Java",
         "manager.modules.C++.suffixes",       "",
         "manager.modules.Python.suffixes",    "py",

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-10-20 06:14:45 UTC (rev 1062)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-10-20 07:30:12 UTC (rev 1063)
@@ -1818,6 +1818,11 @@
                 "Factory not found: " 
                 + comp_id.getProperty("implementaion_id"));
 
+            if (!StringUtil.toBool(
+                   prop.getProperty("manager.modules.search_auto"), 
+                   "YES", "NO", true)) {
+                return null;
+            }
             // automatic module loading
             Vector<Properties> mp = m_module.getLoadableModules();
             rtcout.println(Logbuf.INFO,