[openrtm-commit:02234] r780 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-01-17 11:08:04 +0900 (Tue, 17 Jan 2017)
New Revision: 780

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-01-16 05:48:38 UTC (rev 779)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-01-17 02:08:04 UTC (rev 780)
@@ -997,6 +997,18 @@
     else:
       guard = OpenRTM_aist.ScopedLock(self._masterMutex)
       for master in self._masters:
+        try:
+          prof = master.get_configuration()
+          prop = OpenRTM_aist.Properties()
+          OpenRTM_aist.NVUtil.copyToProperties(prop, prof)
+          name = prop.getProperty("manager.instance_name")
+          if name == manager_name:
+            return master
+        except:
+          self._rtcout.RTC_ERROR("Unknown exception cought.")
+          self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
+          continue
+          
         slaves = master.get_slave_managers()
         for slave in slaves[:]:
           try:
@@ -1010,16 +1022,7 @@
             self._rtcout.RTC_ERROR("Unknown exception cought.")
             self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
             master.remove_slave_manager(slave)
-        try:
-          prof = master.get_configuration()
-          prop = OpenRTM_aist.Properties()
-          OpenRTM_aist.NVUtil.copyToProperties(prop, prof)
-          name = prop.getProperty("manager.instance_name")
-          if name == manager_name:
-            return master
-        except:
-          self._rtcout.RTC_ERROR("Unknown exception cought.")
-          self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
+        
       del guard
 
     return RTM.Manager._nil
@@ -1120,6 +1123,7 @@
 
 
     mgrobj = self.findManager_by_name(mgrstr)
+    
 
     tmp = [arg]
     language = self.get_parameter_by_modulename("language",tmp)
@@ -1194,9 +1198,9 @@
     except:
       self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
       return RTC.RTObject._nil
-    return RTC.RTObject._nil
     
     
+    
 
   ##
   # @if jp
@@ -1287,11 +1291,10 @@
       return RTC.RTObject._nil
     except:
       self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
+      return RTC.RTObject._nil
 
-    return RTC.RTObject._nil
 
 
-
   class is_equiv:
     def __init__(self, mgr):
       self._mgr = mgr