[openrtm-commit:02253] r782 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-01-18 15:52:18 +0900 (Wed, 18 Jan 2017)
New Revision: 782

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-01-17 07:51:01 UTC (rev 781)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-01-18 06:52:18 UTC (rev 782)
@@ -201,18 +201,18 @@
         
     if manager is None:
       guard = OpenRTM_aist.ScopedLock(mutex)
-      if manager is None:
-        manager = Manager()
-        manager.initManager(argv)
-        manager.initLogger()
-        manager.initORB()
-        manager.initNaming()
-        manager.initFactories()
-        manager.initExecContext()
-        manager.initComposite()
-        manager.initTimer()
-        manager.initManagerServant()
 
+      manager = Manager()
+      manager.initManager(argv)
+      manager.initLogger()
+      manager.initORB()
+      manager.initNaming()
+      manager.initFactories()
+      manager.initExecContext()
+      manager.initComposite()
+      manager.initTimer()
+      manager.initManagerServant()
+
     return manager
   
   init = staticmethod(init)
@@ -244,17 +244,16 @@
     
     if manager is None:
       guard = OpenRTM_aist.ScopedLock(mutex)
-      if manager is None:
-        manager = Manager()
-        manager.initManager(None)
-        manager.initLogger()
-        manager.initORB()
-        manager.initNaming()
-        manager.initFactories()
-        manager.initExecContext()
-        manager.initComposite()
-        manager.initTimer()
-        manager.initManagerServant()
+      manager = Manager()
+      manager.initManager(None)
+      manager.initLogger()
+      manager.initORB()
+      manager.initNaming()
+      manager.initFactories()
+      manager.initExecContext()
+      manager.initComposite()
+      manager.initTimer()
+      manager.initManagerServant()
 
     return manager
 
@@ -859,10 +858,10 @@
         self._rtcout.RTC_ERROR("No module for %s in loadable modules list",
                                comp_id.getProperty("implementation_id"))
         return None
-
+      
       if not found_obj.findNode("module_file_name"):
         self._rtcout.RTC_ERROR("Hmm...module_file_name key not found.")
-        return 0
+        return None
 
       # module loading
       self._rtcout.RTC_INFO("Loading module: %s", found_obj.getProperty("module_file_name"))
@@ -871,7 +870,7 @@
       if not factory:
         self._rtcout.RTC_ERROR("Factory not found for loaded module: %s",
                                comp_id.getProperty("implementation_id"))
-        return 0
+        return None
 
 
     # get default configuration of component.