[openrtm-commit:02600] r823 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-04-28 13:40:36 +0900 (Fri, 28 Apr 2017)
New Revision: 823

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-04-28 04:36:34 UTC (rev 822)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-04-28 04:40:36 UTC (rev 823)
@@ -1180,11 +1180,16 @@
         return RTC.RTObject._nil
       time.sleep(0.01)
       count = 0
+      t0_ = OpenRTM_aist.Time()
       while CORBA.is_nil(mgrobj):
         mgrobj = self.findManager_by_name(mgrstr)
         count += 1
         if count > 1000:
           break
+        
+        t1_ = OpenRTM_aist.Time()
+        if (t1_ - t0_).getTime().toDouble() > 10.0:
+          break
         time.sleep(0.01)
       
       if CORBA.is_nil(mgrobj):
@@ -1287,11 +1292,16 @@
       # find manager
       time.sleep(0.01)
       count = 0
+      t0_ = OpenRTM_aist.Time()
       while CORBA.is_nil(mgrobj):
         mgrobj = self.findManager(mgrstr)
         count += 1
         if count > 1000:
           break
+        
+        t1_ = OpenRTM_aist.Time()
+        if (t1_ - t0_).getTime().toDouble() > 10.0:
+          break
         time.sleep(0.01)
 
     if CORBA.is_nil(mgrobj):