[openrtm-commit:02279] r784 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-01-20 12:59:42 +0900 (Fri, 20 Jan 2017)
New Revision: 784

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Factory.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ListenerHolder.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -973,8 +973,8 @@
   # const coil::Properties& getActiveConfigurationSet(void);
   def getActiveConfigurationSet(self):
     p = self._configsets.getNode(self._activeId)
-    if p is None:
-      return self._emptyconf
+    #if p is None:
+    #  return self._emptyconf
 
     return p
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Factory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Factory.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Factory.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -272,7 +272,7 @@
   def create(self, mgr):
     try:
       rtobj = self._New(mgr)
-      if rtobj == 0:
+      if rtobj is None:
         return None
 
       self._Number += 1

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ListenerHolder.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ListenerHolder.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ListenerHolder.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -161,8 +161,8 @@
       for (l,f) in listener_.iteritems():
         if f:
           del l
-    del guard
-    return
+    #del guard
+    #return
   
   ##
   # @if jp

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -188,13 +188,14 @@
   def configure(self, prop):
     prop.setDefaults(OpenRTM_aist.default_config)
     if self.findConfigFile():
-      try:
-        with file(self._configFile,"r") as fd:
-          prop.load(fd)
-          fd.close()
-      except:
-        print OpenRTM_aist.Logger.print_exception()
+      #try:
+      with file(self._configFile,"r") as fd:
+        prop.load(fd)
+        fd.close()
+      #except:
+      #  print OpenRTM_aist.Logger.print_exception()
 
+
     self.setSystemInformation(prop)
     if self._isMaster:
       prop.setProperty("manager.is_master","YES")

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -91,7 +91,7 @@
     self.finalize()
     self.wait()
     Task.__del__(self)
-    return
+
   
     
   ##

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2017-01-18 08:51:32 UTC (rev 783)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2017-01-20 03:59:42 UTC (rev 784)
@@ -4876,9 +4876,9 @@
       
       default_opts = OpenRTM_aist.Properties()
       prop_ = default_prop.findNode("exec_cxt.periodic")
-      if not prop_:
-        self._rtcout.RTC_WARN("No default EC options found.")
-        return RTC.RTC_ERROR
+      #if not prop_:
+      #  self._rtcout.RTC_WARN("No default EC options found.")
+      #  return RTC.RTC_ERROR
 
       default_opts.mergeProperties(prop_)