[openrtm-commit:01758] r659 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-25 15:02:51 +0900 (Thu, 25 Feb 2016)
New Revision: 659

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ComponentActionListener.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py
Log:
[compat,bugfix,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py	2016-02-25 05:27:39 UTC (rev 658)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py	2016-02-25 06:02:51 UTC (rev 659)
@@ -2,8 +2,8 @@
 # -*- coding: euc-jp -*-
 
 ##
-# @file  InPortConsumer.py
-# @brief InPortConsumer class
+# @file  CdrBufferBase.py
+# @brief CdrBufferBase class
 # @date  $Date: 2007-12-31 03:08:03 $
 # @author Noriaki Ando <n-ando at aist.go.jp> and Shinji Kurihara
 #

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ComponentActionListener.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ComponentActionListener.py	2016-02-25 05:27:39 UTC (rev 658)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ComponentActionListener.py	2016-02-25 06:02:51 UTC (rev 659)
@@ -1089,52 +1089,51 @@
   """
 
   def __init__(self):
-    pass
 
-  ##
-  # @if jp
-  # @brief PreComponentActionListenerTypeリスナ配列
-  # PreComponentActionListenerTypeリスナを格納
-  # @else
-  # @brief PreComponentActionListenerType listener array
-  # The PreComponentActionListenerType listener is stored. 
-  # @endif
-  preaction_num = PreComponentActionListenerType.PRE_COMPONENT_ACTION_LISTENER_NUM
-  preaction_ = [PreComponentActionListenerHolder() 
-                for i in range(preaction_num)]
+    ##
+    # @if jp
+    # @brief PreComponentActionListenerTypeリスナ配列
+    # PreComponentActionListenerTypeリスナを格納
+    # @else
+    # @brief PreComponentActionListenerType listener array
+    # The PreComponentActionListenerType listener is stored. 
+    # @endif
+    self.preaction_num = PreComponentActionListenerType.PRE_COMPONENT_ACTION_LISTENER_NUM
+    self.preaction_ = [PreComponentActionListenerHolder() 
+                for i in range(self.preaction_num)]
 
-  ##
-  # @if jp
-  # @brief PostComponentActionListenerTypeリスナ配列
-  # PostComponentActionListenerTypeリスナを格納
-  # @else
-  # @brief PostComponentActionListenerType listener array
-  # The PostComponentActionListenerType listener is stored.
-  # @endif
-  postaction_num = PostComponentActionListenerType.POST_COMPONENT_ACTION_LISTENER_NUM
-  postaction_ = [PostComponentActionListenerHolder()
-                 for i in range(postaction_num)]
+    ##
+    # @if jp
+    # @brief PostComponentActionListenerTypeリスナ配列
+    # PostComponentActionListenerTypeリスナを格納
+    # @else
+    # @brief PostComponentActionListenerType listener array
+    # The PostComponentActionListenerType listener is stored.
+    # @endif
+    self.postaction_num = PostComponentActionListenerType.POST_COMPONENT_ACTION_LISTENER_NUM
+    self.postaction_ = [PostComponentActionListenerHolder()
+                 for i in range(self.postaction_num)]
 
-  ##
-  # @if jp
-  # @brief PortActionListenerTypeリスナ配列
-  # PortActionListenerTypeリスナを格納
-  # @else
-  # @brief PortActionListenerType listener array
-  # The PortActionListenerType listener is stored.
-  # @endif
-  portaction_num = PortActionListenerType.PORT_ACTION_LISTENER_NUM
-  portaction_ = [PortActionListenerHolder()
-                 for i in range(portaction_num)]
+    ##
+    # @if jp
+    # @brief PortActionListenerTypeリスナ配列
+    # PortActionListenerTypeリスナを格納
+    # @else
+    # @brief PortActionListenerType listener array
+    # The PortActionListenerType listener is stored.
+    # @endif
+    self.portaction_num = PortActionListenerType.PORT_ACTION_LISTENER_NUM
+    self.portaction_ = [PortActionListenerHolder()
+                 for i in range(self.portaction_num)]
   
-  ##
-  # @if jp
-  # @brief ExecutionContextActionListenerTypeリスナ配列
-  # ExecutionContextActionListenerTypeリスナを格納
-  # @else
-  # @brief ExecutionContextActionListenerType listener array
-  # The ExecutionContextActionListenerType listener is stored.
-  # @endif
-  ecaction_num = ExecutionContextActionListenerType.EC_ACTION_LISTENER_NUM
-  ecaction_ = [ExecutionContextActionListenerHolder()
-               for i in range(ecaction_num)]
+    ##
+    # @if jp
+    # @brief ExecutionContextActionListenerTypeリスナ配列
+    # ExecutionContextActionListenerTypeリスナを格納
+    # @else
+    # @brief ExecutionContextActionListenerType listener array
+    # The ExecutionContextActionListenerType listener is stored.
+    # @endif
+    self.ecaction_num = ExecutionContextActionListenerType.EC_ACTION_LISTENER_NUM
+    self.ecaction_ = [ExecutionContextActionListenerHolder()
+               for i in range(self.ecaction_num)]

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py	2016-02-25 05:27:39 UTC (rev 658)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py	2016-02-25 06:02:51 UTC (rev 659)
@@ -24,7 +24,6 @@
 #
 # 
 #
-# @since 0.4.0
 #
 # @else
 #

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py	2016-02-25 05:27:39 UTC (rev 658)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py	2016-02-25 06:02:51 UTC (rev 659)
@@ -275,24 +275,24 @@
     self._rtcout.RTC_PARANOID("OutPortCorbaCdrProvider.get()")
     if not self._buffer:
       self.onSenderError()
-      return (OpenRTM.UNKNOWN_ERROR, None)
+      return (OpenRTM.UNKNOWN_ERROR, "")
 
     try:
       if self._buffer.empty():
         self._rtcout.RTC_ERROR("buffer is empty.")
-        return (OpenRTM.BUFFER_EMPTY, None)
+        return (OpenRTM.BUFFER_EMPTY, "")
 
       cdr = [None]
       ret = self._buffer.read(cdr)
 
       if ret == OpenRTM_aist.BufferStatus.BUFFER_OK:
-        if not cdr:
+        if not cdr[0]:
           self._rtcout.RTC_ERROR("buffer is empty.")
-          return (OpenRTM.BUFFER_EMPTY, None)
+          return (OpenRTM.BUFFER_EMPTY, "")
       
     except:
       self._rtcout.RTC_TRACE(OpenRTM_aist.Logger.print_exception())
-      return (OpenRTM.UNKNOWN_ERROR, None)
+      return (OpenRTM.UNKNOWN_ERROR, "")
 
     return self.convertReturn(ret, cdr[0])