[openrtm-commit:02718] r987 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src: Extension/LocalService/nameservice_file RTMExamples/SimpleIO RTMExamples/SimpleService RTMExamples/TopicTest jp/go/aist/rtm/RTC/buffer jp/go/aist/rtm/RTC/executionContext jp/go/aist/rtm/RTC/port
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 7月 28日 (金) 15:16:53 JST
Author: t-katami
Date: 2017-07-28 15:16:53 +0900 (Fri, 28 Jul 2017)
New Revision: 987
Modified:
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleIO/ConsoleInImpl.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleService/MyServiceConsumerImpl.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/TopicTest/ConsoleInImpl.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/buffer/RingBuffer.java
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/port/InPortSHMConsumer.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMConsumer.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/Extension/LocalService/nameservice_file/FileNameservice.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -279,7 +279,7 @@
if (fs.equals("flat")) {
rtcout.println(Logbuf.DEBUG,"file_structure = flat");
String d = m_profile.properties.getProperty("context_delimiter");
- ns_path.replaceAll(file_separator, d);
+ ns_path = ns_path.replaceAll(file_separator, d);
pathstring += ns_path;
}
else if (fs.equals("tree")) {
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleIO/ConsoleInImpl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleIO/ConsoleInImpl.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleIO/ConsoleInImpl.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -147,7 +147,10 @@
System.out.println("Please input number: ");
BufferedReader buff = new BufferedReader(new InputStreamReader( System.in ));
try {
- m_out_val.data = Integer.parseInt(buff.readLine());
+ String str = buff.readLine();
+ if(str != null){
+ m_out_val.data = Integer.parseInt(str);
+ }
} catch (NumberFormatException e) {
System.out.println("Input number Error!");
// e.printStackTrace();
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleService/MyServiceConsumerImpl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleService/MyServiceConsumerImpl.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/SimpleService/MyServiceConsumerImpl.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -90,6 +90,10 @@
} catch (IOException e) {
e.printStackTrace();
}
+
+ if(args == null){
+ return super.onExecute(ec_id);
+ }
pos = args.indexOf(" ");
if( pos>0 ) {
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/TopicTest/ConsoleInImpl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/TopicTest/ConsoleInImpl.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/TopicTest/ConsoleInImpl.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -159,7 +159,10 @@
System.out.println("Please input number: ");
BufferedReader buff = new BufferedReader(new InputStreamReader( System.in ));
try {
- m_out_val.data = Integer.parseInt(buff.readLine());
+ String str = buff.readLine();
+ if(str != null){
+ m_out_val.data = Integer.parseInt(str);
+ }
} catch (NumberFormatException e) {
System.out.println("Input number Error!");
// e.printStackTrace();
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/buffer/RingBuffer.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/buffer/RingBuffer.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/buffer/RingBuffer.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -109,8 +109,10 @@
*
*/
public ReturnCode length(int n) {
- m_buffer.setSize(n);
- m_length = n;
+ synchronized (m_posmutex) {
+ m_buffer.setSize(n);
+ m_length = n;
+ }
this.reset();
return ReturnCode.BUFFER_OK; //BUFFER_OK;
}
@@ -966,7 +968,9 @@
try {
double tm = Double.parseDouble(prop.getProperty("write.timeout"));
if (!(tm < 0)) {
- m_wtimeout.convert(tm);
+ synchronized (m_full.mutex) {
+ m_wtimeout.convert(tm);
+ }
}
}
catch(NumberFormatException e){
@@ -996,7 +1000,9 @@
try {
double tm = Double.parseDouble(prop.getProperty("read.timeout"));
if (!(tm < 0)) {
- m_rtimeout.convert(tm);
+ synchronized (m_empty.mutex) {
+ m_rtimeout.convert(tm);
+ }
}
}
catch(NumberFormatException e){
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-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -221,7 +221,12 @@
}
}
public final String getKindString() {
- return getKindString(m_profile.kind);
+ //return getKindString(m_profile.kind);
+ String str = new String();
+ synchronized (m_profile){
+ str = getKindString(m_profile.kind);
+ }
+ return str;
}
/**
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortSHMConsumer.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortSHMConsumer.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortSHMConsumer.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -522,7 +522,9 @@
* {@.en OutPortConnector}
*/
public void setConnector(OutPortConnector connector) {
- m_connector = connector;
+ synchronized(m_mutex) {
+ m_connector = connector;
+ }
}
private Logbuf rtcout;
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -205,11 +205,11 @@
*
*/
public Vector<ConnectorBase.ConnectorInfo> getConnectorProfiles(){
- rtcout.println(Logbuf.TRACE,
- "getConnectorProfiles(): size = "+m_connectors.size());
Vector<ConnectorBase.ConnectorInfo> profs
= new Vector<ConnectorBase.ConnectorInfo>();
synchronized (m_connectors){
+ rtcout.println(Logbuf.TRACE,
+ "getConnectorProfiles(): size = "+m_connectors.size());
for (int i=0, len=m_connectors.size(); i < len; ++i) {
profs.add(m_connectors.elementAt(i).profile());
}
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMConsumer.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMConsumer.java 2017-07-28 01:34:25 UTC (rev 986)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMConsumer.java 2017-07-28 06:16:53 UTC (rev 987)
@@ -128,7 +128,9 @@
*/
public void setBuffer(BufferBase<OutputStream> buffer) {
rtcout.println(Logbuf.TRACE, "OutPortSHMConsumer.setBuffer()");
- m_buffer = buffer;
+ synchronized(m_mutex) {
+ m_buffer = buffer;
+ }
}
/**
* {@.ja リスナを設定する。}
More information about the openrtm-commit
mailing list