[openrtm-commit:02150] r763 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-11-30 13:41:49 +0900 (Wed, 30 Nov 2016)
New Revision: 763

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py	2016-11-29 09:29:58 UTC (rev 762)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py	2016-11-30 04:41:49 UTC (rev 763)
@@ -319,7 +319,6 @@
   #
   # @endif
   def _ptr(self, get_ref=False):
-    #print dir(self._var)
     if get_ref:
       return self._var
     if self._sev is not None:

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py	2016-11-29 09:29:58 UTC (rev 762)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py	2016-11-30 04:41:49 UTC (rev 763)
@@ -444,10 +444,9 @@
     else:
       return (OpenRTM.UNKNOWN_ERROR, data)
     
-    self.onSenderError()
-    return (OpenRTM.UNKNOWN_ERROR, data)
 
 
+
 def OutPortCorbaCdrProviderInit():
   factory = OpenRTM_aist.OutPortProviderFactory.instance()
   factory.addFactory("corba_cdr",

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2016-11-29 09:29:58 UTC (rev 762)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2016-11-30 04:41:49 UTC (rev 763)
@@ -199,8 +199,8 @@
     if defaults_map:
       #for i in range(len(defaults_map.items())):
       #  self.setDefault(defaults_map.keys()[i], defaults_map.values()[i])
-      for key, value in defaults_map.items():
-        self.setDefault(key, value)
+      for _key, _value in defaults_map.items():
+        self.setDefault(_key, _value)
       return
 
     if defaults_str:

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py	2016-11-29 09:29:58 UTC (rev 762)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py	2016-11-30 04:41:49 UTC (rev 763)
@@ -20,6 +20,7 @@
 import threading
 import logging
 import logging.handlers
+import OpenRTM_aist
 
 logger = None
 
@@ -112,6 +113,7 @@
 
   def init(*args):
     global logger
+    
 
     if logger is not None:
       return logger
@@ -325,6 +327,7 @@
     self._loggerObj = Logger.init(*args)
     self._log_enable = True
     self.logger = logging.getLogger(name)
+    self.guard = None
 
 
   def __del__(self):
@@ -440,7 +443,7 @@
   # @endif
   def acquire(self):
     if self._LogLock:
-      self.guard = OpenRTM_aist.ScopedLock(self._mutex)
+      self.guard = OpenRTM_aist.ScopedLock(self._loggerObj._mutex)
 
 
   ##
@@ -455,7 +458,7 @@
   #
   # @endif
   def release(self):
-    if self._LogLock:
+    if self._LogLock and self.guard:
       del self.guard