[openrtm-commit:00397] r556 - trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-09-08 15:17:44 +0900 (Thu, 08 Sep 2011)
New Revision: 556

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:
New option "manager.auto_shutdown_duration" has been added.  refs #2226

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	2011-09-08 05:30:35 UTC (rev 555)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2011-09-08 06:17:44 UTC (rev 556)
@@ -57,6 +57,7 @@
         "manager.corba_servant",            "YES",
         "manager.shutdown_on_nortcs",          "YES",
         "manager.shutdown_auto",            "YES",
+        "manager.auto_shutdown_duration",        "10.0",
         "manager.name",                     "manager",
         "manager.command",                  "rtcd",
         "sdo.service.provider.enabled_services",  "ALL",

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	2011-09-08 05:30:35 UTC (rev 555)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-09-08 06:17:44 UTC (rev 556)
@@ -1796,6 +1796,16 @@
             !StringUtil.toBool(m_config.getProperty("manager.is_master"), 
                               "YES", "NO", false) ) {
             TimeValue tm = new TimeValue(10, 0);
+            if (m_config.findNode("manager.auto_shutdown_duration") != null) {
+                double duration;
+                String s = m_config.getProperty("manager.auto_shutdown_duration");
+                try{
+                    duration = Double.parseDouble(s);
+                    tm.convert(duration);
+                }
+                catch (NumberFormatException ex){
+                }
+            }
             if (m_timer != null) {
                 m_timer.registerListenerObj(m_shutdownOnNoRtcs, tm);
             }