[openrtm-commit:02732] r997 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . executionContext

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-09 10:12:49 +0900 (Wed, 09 Aug 2017)
New Revision: 997

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/StateMachine.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.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/NamingManager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2017-08-09 00:05:29 UTC (rev 996)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2017-08-09 01:12:49 UTC (rev 997)
@@ -396,7 +396,9 @@
      *   {@.en List of NameService}
      */
     public Vector<NamingService> getNameServices() {
-        return m_names;
+        synchronized (m_names) {
+            return m_names;
+        }
     }
     /**
      *

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/StateMachine.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/StateMachine.java	2017-08-09 00:05:29 UTC (rev 996)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/StateMachine.java	2017-08-09 01:12:49 UTC (rev 997)
@@ -408,9 +408,11 @@
      *   {@.en Initial state}
      */
     public void setStartState(StateHolder states) {
-        m_states.curr = (STATE)(states.curr);
-        m_states.prev = (STATE)states.prev;
-        m_states.next = (STATE)states.next;
+        synchronized (m_states) {
+            m_states.curr = (STATE)(states.curr);
+            m_states.prev = (STATE)states.prev;
+            m_states.next = (STATE)states.next;
+        }
     }
 
     /**

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java	2017-08-09 00:05:29 UTC (rev 996)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java	2017-08-09 01:12:49 UTC (rev 997)
@@ -437,10 +437,12 @@
      *
      */
     public final RTObject[] getComponentList() {
-        rtcout.println(Logbuf.TRACE,"getComponentList("
+        synchronized (m_profile){
+            rtcout.println(Logbuf.TRACE,"getComponentList("
                                     + m_profile.participants.length
                                     +")");
-        return m_profile.participants;
+            return m_profile.participants;
+        }
     }
 
     /**