[openrtm-commit:00702] r663 - trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2012-02-13 12:01:05 +0900 (Mon, 13 Feb 2012)
New Revision: 663

Modified:
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
Default and inherited configurations have been updated for new EC. Now non-empty properties are only inherited.  refs #2338  

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2012-02-13 02:28:13 UTC (rev 662)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2012-02-13 03:01:05 UTC (rev 663)
@@ -50,7 +50,9 @@
         "corba.nameservice.replace_endpoint", "NO",
         "exec_cxt.periodic.type", "jp.go.aist.rtm.RTC.executionContext.PeriodicExecutionContext",
         "exec_cxt.periodic.rate", "1000",
-        "exec_cxt.evdriven.type", "jp.go.aist.rtm.RTC.executionContext.EventDrivenExecutionContext",
+        "exec_cxt.sync_transition",              "YES",
+        "exec_cxt.transition_timeout",           "0.5",
+        //"exec_cxt.evdriven.type", "jp.go.aist.rtm.RTC.executionContext.EventDrivenExecutionContext",
         "manager.modules.load_path",        "./",
         "manager.modules.abs_path_allowed", "YES",
         "manager.is_master",                "NO",

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2012-02-13 02:28:13 UTC (rev 662)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2012-02-13 03:01:05 UTC (rev 663)
@@ -978,6 +978,14 @@
             "exec_cxt.periodic.type",
             "exec_cxt.periodic.rate",
             "exec_cxt.evdriven.type",
+            "exec_cxt.sync_transition",
+            "exec_cxt.sync_activation",
+            "exec_cxt.sync_deactivation",
+            "exec_cxt.sync_reset",
+            "exec_cxt.transition_timeout",
+            "exec_cxt.activation_timeout",
+            "exec_cxt.deactivation_timeout",
+            "exec_cxt.reset_timeout",
             "logger.enable",
             "logger.log_level",
             "naming.enable",
@@ -987,8 +995,11 @@
         };
 
         for (int ic=0; inherit_prop[ic].length() != 0; ++ic) {
-            prop.setProperty(inherit_prop[ic], 
-                                m_config.getProperty(inherit_prop[ic]));
+            
+            String key = inherit_prop[ic];
+            if (m_config.findNode(key) != null) {
+                prop.setProperty(key,m_config.getProperty(key));
+            }
         }
 
         comp = factory.create(this);