[openrtm-commit:02183] r769 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-12-20 18:31:20 +0900 (Tue, 20 Dec 2016)
New Revision: 769

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.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	2016-12-19 07:01:27 UTC (rev 768)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-12-20 09:31:20 UTC (rev 769)
@@ -1547,6 +1547,7 @@
       self._orb = CORBA.ORB_init(argv)
 
       self._poa = self._orb.resolve_initial_references("RootPOA")
+      
       if CORBA.is_nil(self._poa):
         self._rtcout.RTC_ERROR("Could not resolve RootPOA")
         return False
@@ -1710,13 +1711,13 @@
         self._rtcout.RTC_PARANOID("Pending work still exists.")
         if self._orb.work_pending():
             self._orb.perform_work()
-            pass
 
+
       self._rtcout.RTC_DEBUG("No pending works of ORB. Shutting down POA and ORB.")
     except:
       self._rtcout.RTC_TRACE(OpenRTM_aist.Logger.print_exception())
-      pass
 
+    
     if not CORBA.is_nil(self._poa):
       try:
         if not CORBA.is_nil(self._poaManager):
@@ -2039,16 +2040,16 @@
         p.mergeProperties(comp.getProperties())
       except:
         self._rtcout.RTC_TRACE(OpenRTM_aist.Logger.print_exception())
-        pass
 
+
     for ec in self._ecs:
       try:
         self._poa.deactivate_object(self._poa.servant_to_id(ec))
       except:
         self._rtcout.RTC_TRACE(OpenRTM_aist.Logger.print_exception())
-        pass
 
 
+
   ##
   # @if jp
   # @brief RTコンポーネントの登録解除
@@ -3133,7 +3134,6 @@
         #Manager.instance().shutdown()
       except:
         print OpenRTM_aist.Logger.print_exception()
-        pass
       return
 
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py	2016-12-19 07:01:27 UTC (rev 768)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py	2016-12-20 09:31:20 UTC (rev 769)
@@ -439,9 +439,9 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       raise SDOPackage.InternalError("Configuration.remove_service_profile")
 
-    return False
 
 
+
   ##
   # @if jp
   # 
@@ -534,17 +534,13 @@
   # @endif
   def get_configuration_parameters(self):
     self._rtcout.RTC_TRACE("get_configuration_parameters()")
-    try:
-      guard = OpenRTM_aist.ScopedLock(self._params_mutex)
-      param = copy.copy(self._parameters)
-      return param
-    except:
-      self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
-      raise SDOPackage.InternalError("Configuration.get_configuration_parameters")
 
-    return []
+    guard = OpenRTM_aist.ScopedLock(self._params_mutex)
+    param = copy.copy(self._parameters)
+    return param
 
 
+
   ##
   # @if jp
   # 
@@ -740,8 +736,8 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       raise SDOPackage.InternalError("Configuration.get_configuration_sets")
 
-    return []
 
+
   ##
   # @if jp
   # 
@@ -798,17 +794,14 @@
 
     configset = self._configsets.getConfigurationSet(config_id)
 
-    try:
-      config = SDOPackage.ConfigurationSet("","",[])
-      toConfigurationSet(config, configset)
-      return config
-    except:
-      self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
-      raise SDOPackage.InternalError("Configuration::get_configuration_set()")
 
-    return SDOPackage.ConfigurationSet("","",[])
+    config = SDOPackage.ConfigurationSet("","",[])
+    toConfigurationSet(config, configset)
+    return config
 
 
+
+
   ##
   # @if jp
   # 
@@ -887,9 +880,9 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       raise SDOPackage.InternalError("Configuration::set_configuration_set_values()")
 
-    return True
 
 
+
   ##
   # @if jp
   # 
@@ -1007,12 +1000,13 @@
       config_id = configuration_set.id
       config = OpenRTM_aist.Properties(key=config_id)
       toProperties(config, configuration_set)
+      
       return self._configsets.addConfigurationSet(config)
     except:
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       raise SDOPackage.InternalError("Configuration::add_configuration_set()")
 
-    return True
+    
 
 
   ##