[openrtm-commit:02442] r947 - in branches/RELENG_1_2/OpenRTM-aist-Java: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 14日 (火) 18:47:43 JST
Author: kawauchi
Date: 2017-02-14 18:47:42 +0900 (Tue, 14 Feb 2017)
New Revision: 947
Modified:
branches/RELENG_1_2/OpenRTM-aist-Java/
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorBase.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java
Log:
[merge] r932,943 have been merged from trunk.
Property changes on: branches/RELENG_1_2/OpenRTM-aist-Java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_1/OpenRTM-aist-Java:806
/trunk/OpenRTM-aist-Java:929-930
+ /branches/RELENG_1_1/OpenRTM-aist-Java:806
/trunk/OpenRTM-aist-Java:929-930,932,943
Property changes on: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:806
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:929-930
+ /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:806
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:929-930,932,943
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorBase.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorBase.java 2017-02-14 07:19:32 UTC (rev 946)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorBase.java 2017-02-14 09:47:42 UTC (rev 947)
@@ -43,7 +43,7 @@
name = name_;
id = id_;
ports = ports_;
- properties = properties_;
+ properties = new Properties(properties_);
}
public String name;
public String id;
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java 2017-02-14 07:19:32 UTC (rev 946)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java 2017-02-14 09:47:42 UTC (rev 947)
@@ -369,60 +369,90 @@
} else if (klass.equals(TimedBooleanSeq.class)) {
TimedBooleanSeq timedData = TimedBooleanSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new boolean[0];
+ }
TimedBooleanSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedCharSeq.class)) {
TimedCharSeq timedData = TimedCharSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new char[0];
+ }
TimedCharSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedDoubleSeq.class)) {
TimedDoubleSeq timedData = TimedDoubleSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new double[0];
+ }
TimedDoubleSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedFloatSeq.class)) {
TimedFloatSeq timedData = TimedFloatSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new float[0];
+ }
TimedFloatSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedLongSeq.class)) {
TimedLongSeq timedData = TimedLongSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new int[0];
+ }
TimedLongSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedOctetSeq.class)) {
TimedOctetSeq timedData = TimedOctetSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new byte[0];
+ }
TimedOctetSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedShortSeq.class)) {
TimedShortSeq timedData = TimedShortSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new short[0];
+ }
TimedShortSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedStringSeq.class)) {
TimedStringSeq timedData = TimedStringSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new String[0];
+ }
TimedStringSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedULongSeq.class)) {
TimedULongSeq timedData = TimedULongSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new int[0];
+ }
TimedULongSeqHelper.insert(any, timedData);
return any;
} else if (klass.equals(TimedUShortSeq.class)) {
TimedUShortSeq timedData = TimedUShortSeq.class.cast(data);
timedData.tm = fillTime(timedData.tm);
+ if(timedData.data==null){
+ timedData.data = new short[0];
+ }
TimedUShortSeqHelper.insert(any, timedData);
return any;
} else {
openrtm-commit メーリングリストの案内