[openrtm-commit:02637] r844 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-06-15 10:45:41 +0900 (Thu, 15 Jun 2017)
New Revision: 844

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
Log:
[merge] r841-843 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-06-13 06:27:26 UTC (rev 843)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-06-15 01:45:41 UTC (rev 844)
@@ -226,7 +226,7 @@
 
     for i in range(len(prof)):
       OpenRTM_aist.NVUtil.copyFromProperties(cprof[i].properties, prof[i])
-
+    
     return cprof
 
 
@@ -1170,6 +1170,7 @@
   # @endif
   # RTC::RTObject_ptr create_component_by_mgrname(string module_name)
   def create_component_by_mgrname(self, module_name):
+    
     arg = module_name
     
 
@@ -1207,7 +1208,7 @@
       #rtcd_cmd = "rtcd_python.bat"
 
       load_path = config.getProperty("manager.modules.load_path")
-      load_path_language = config.getProperty("manager.modules."+language+".load_path")
+      load_path_language = config.getProperty("manager.modules."+language+".load_paths")
       load_path = load_path + "," + load_path_language
       
       if platform.system() == "Windows":
@@ -1220,10 +1221,12 @@
       cmd += " -o " + "manager.name:" + config.getProperty("manager.name")
       cmd += " -o " + "manager.instance_name:" + mgrstr
       cmd += " -o " + "\"manager.modules.load_path:" + load_path + "\""
-      #cmd += " -o " + "manager.supported_languages:" + language
+      cmd += " -o " + "manager.supported_languages:" + language
+      cmd += " -o " + "manager.shutdown_auto:NO"
       
       
       
+      
       self._rtcout.RTC_DEBUG("Invoking command: %s.", cmd)
       
       ret = OpenRTM_aist.launch_shell(cmd)

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2017-06-13 06:27:26 UTC (rev 843)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2017-06-15 01:45:41 UTC (rev 844)
@@ -580,7 +580,7 @@
   def addNewFile(self, fpath, modules):
     exists = False
     for modprof in self._modprofs:
-      if modprof == fpath:
+      if modprof.getProperty("module_file_path") == fpath:
         exists = True
         self._rtcout.RTC_DEBUG("Module %s already exists in cache.",fpath)
         break
@@ -627,9 +627,11 @@
         
         try:
           ret = OpenRTM_aist.popen(cmd).split("\r\n")
+          count = 0
           for r in ret:
             pos = r.find(":")
             if r.find(":") != -1:
+              count += 1
               key = r[0:pos]
               tmp = [key]
               OpenRTM_aist.eraseHeadBlank(tmp)
@@ -641,10 +643,11 @@
               value = tmp[0]
 
               prop.setProperty(key, value)
-          self._rtcout.RTC_DEBUG("rtcprof cmd sub process done.")
-          prop.setProperty("module_file_name",os.path.basename(mod_))
-          prop.setProperty("module_file_path", mod_)
-          modprops.append(prop)
+          if count > 0:
+            self._rtcout.RTC_DEBUG("rtcprof cmd sub process done.")
+            prop.setProperty("module_file_name",os.path.basename(mod_))
+            prop.setProperty("module_file_path", mod_)
+            modprops.append(prop)
               
           
         except:
@@ -722,6 +725,7 @@
       modules_ = []
       self.getModuleList(lang, modules_)
       self._rtcout.RTC_DEBUG("%s: %s", (lang, OpenRTM_aist.flatten(modules_)))
+      
 
       tmpprops = []
       self.getModuleProfiles(lang, modules_, tmpprops)

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2017-06-13 06:27:26 UTC (rev 843)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2017-06-15 01:45:41 UTC (rev 844)
@@ -205,8 +205,10 @@
     else:
       self._rtcout.RTC_ERROR("write(): endian %s is not support.",self._endian)
       return self.UNKNOWN_ERROR
-    
-    self._buffer.write(cdr_data)
+    if self._buffer:
+      self._buffer.write(cdr_data)
+    else:
+      return self.UNKNOWN_ERROR
     return self.PORT_OK