[openrtm-commit:02552] r809 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-04-03 13:24:09 +0900 (Mon, 03 Apr 2017)
New Revision: 809

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Timer.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-04-03 03:26:53 UTC (rev 808)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-04-03 04:24:09 UTC (rev 809)
@@ -1157,7 +1157,7 @@
                                                      "YES","NO",False):
         comps = self.getComponents()
         if len(comps) == 0:
-          self.shutdown()
+          self.createShutdownThread()
 
     return
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Timer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Timer.py	2017-04-03 03:26:53 UTC (rev 808)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Timer.py	2017-04-03 04:24:09 UTC (rev 809)
@@ -95,7 +95,7 @@
   def join(self):
     try:
       self._thread.join()
-      self._thread = threading.Thread(target=self.run)
+      #self._thread = threading.Thread(target=self.run)
     except:
       pass