[openrtm-commit:02201] r772 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-01-11 19:07:18 +0900 (Wed, 11 Jan 2017)
New Revision: 772

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py	2016-12-21 06:18:29 UTC (rev 771)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py	2017-01-11 10:07:18 UTC (rev 772)
@@ -355,10 +355,9 @@
       else:
         self.__print_exception()
         raise
-      
-    return
 
 
+
   ##
   # @if jp
   #

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-12-21 06:18:29 UTC (rev 771)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2017-01-11 10:07:18 UTC (rev 772)
@@ -213,10 +213,7 @@
     except:
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       return self.CONNECTION_LOST
-    
-    
-        
-    return self.UNKNOWN_ERROR
+
  
 
 def InPortSHMConsumerInit():

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2016-12-21 06:18:29 UTC (rev 771)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-01-11 10:07:18 UTC (rev 772)
@@ -1152,6 +1152,7 @@
       
       self._rtcout.RTC_DEBUG("Invoking command: %s.", cmd)
       ret = OpenRTM_aist.launch_shell(cmd)
+      print cmd, ret
       
       if ret == -1:
         self._rtcout.RTC_DEBUG("%s: failed", cmd)
@@ -1254,6 +1255,7 @@
 
       self._rtcout.RTC_DEBUG("Invoking command: %s.", cmd)
       ret = OpenRTM_aist.launch_shell(cmd)
+      print cmd, ret
       if ret == -1:
         self._rtcout.RTC_DEBUG("%s: failed", cmd)
         return RTC.RTObject._nil
@@ -1262,6 +1264,7 @@
       time.sleep(0.01)
       count = 0
       while CORBA.is_nil(mgrobj):
+        print count
         mgrobj = self.findManager(mgrstr)
         count += 1
         if count > 1000:

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py	2016-12-21 06:18:29 UTC (rev 771)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py	2017-01-11 10:07:18 UTC (rev 772)
@@ -144,6 +144,7 @@
     for sdo in sdo_list:
       dfc = [None]
       if not self.sdoToDFC(sdo, dfc):
+        sdo_list.remove(sdo)
         continue
       member = self.Member(dfc[0])
       self.stopOwnedEC(member)
@@ -190,6 +191,7 @@
     for sdo in sdo_list:
       dfc = [None]
       if not self.sdoToDFC(sdo, dfc):
+        sdo_list.remove(sdo)
         continue
       
       member = self.Member(dfc[0])
@@ -777,6 +779,7 @@
 
     # since Python 2.5
     # self._rtcout.RTC_DEBUG("%d member RTC%s activated.", (len_,(lambda x:  if x > 1 else "was")(len_)))
+    
     if len_ > 1:
       str_ = "s were"
     else:

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortProfileHelper.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortProfileHelper.py	2016-12-21 06:18:29 UTC (rev 771)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortProfileHelper.py	2017-01-11 10:07:18 UTC (rev 772)
@@ -456,8 +456,8 @@
     else:
       return self._connProfiles[index]
 
-    return None
 
+
   ##
   # @if jp
   #