[openrtm-commit:02738] r1002 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: executionContext util

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-10 17:08:45 +0900 (Thu, 10 Aug 2017)
New Revision: 1002

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicECOrganization.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/Properties.java
Log:
[compat,bugfix,->RELENG_1_2] Fixed the items pointed out by the static code analysis tool.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicECOrganization.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicECOrganization.java	2017-08-10 04:53:40 UTC (rev 1001)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicECOrganization.java	2017-08-10 08:08:45 UTC (rev 1002)
@@ -598,10 +598,9 @@
 
         String plist 
           = m_rtobj.getProperties().getProperty("conf.default.exported_ports");
+        plist = plist.replace(" ,",",");
+        plist = plist.replace(", ",",");
         m_expPorts = StringUtil.split(plist, ",");
-	for (int i=0; i<m_expPorts.size(); ++i) {
-	    m_expPorts.set(i,m_expPorts.get(i).trim());
-	}
     }
 
     /**

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/Properties.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/Properties.java	2017-08-10 04:53:40 UTC (rev 1001)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/Properties.java	2017-08-10 08:08:45 UTC (rev 1002)
@@ -721,11 +721,10 @@
     public void clear() {
         
         while (true) {
-            int ic = this.leaf.size() - 1;
-            if(ic < 0) {
+            if(this.leaf.size() <= 0) {
                 break;
             }
-            Properties tail = this.leaf.get(ic);
+            Properties tail = this.leaf.lastElement();
             if (tail != null) {
                 tail.destruct();
             }