[openrtm-commit:03327] r1128 - in branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . port
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 30日 (金) 14:15:38 JST
Author: t-katami
Date: 2018-03-30 14:15:38 +0900 (Fri, 30 Mar 2018)
New Revision: 1128
Modified:
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java
Log:
[merge] r1123-r1127 have been merged from trunk.
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -1748,6 +1748,10 @@
""
};
+ Properties prop_ = prop.getNode("port");
+ prop_.merge(m_config.getNode("port"));
+
+
for (int ic=0; inherit_prop[ic].length() != 0; ++ic) {
String key = inherit_prop[ic];
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -886,6 +886,7 @@
List<String> cmdlist = new ArrayList();
String osname = System.getProperty("os.name").toLowerCase();
if(osname.startsWith("windows")){
+ module = module.replace("\\","/");
cmdlist.add("cmd");
cmdlist.add("/c");
}
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -37,6 +37,7 @@
import org.omg.CORBA.ORB;
import org.omg.CORBA.SystemException;
import org.omg.PortableServer.POA;
+import org.omg.PortableServer.POAHelper;
import OpenRTM.DataFlowComponent;
import OpenRTM.DataFlowComponentHelper;
@@ -817,6 +818,17 @@
if (m_exiting) {
return ReturnCode_t.RTC_OK;
}
+
+ try{
+ Organization[] orglist = get_organizations();
+ for (Organization org:orglist) {
+ org.remove_member(getInstanceName());
+ }
+ }
+ catch(Exception ex){
+ rtcout.println(Logbuf.WARN, "no organization");
+ }
+
// deactivate myself on owned EC
CORBA_SeqUtil.for_each(m_ecMine,
new deactivate_comps((LightweightRTObject)m_objref._duplicate()));
@@ -6048,6 +6060,10 @@
finalizeContexts();
m_pPOA.deactivate_object(m_pPOA.servant_to_id(m_pSdoConfigImpl));
m_pPOA.deactivate_object(m_pPOA.servant_to_id(this));
+ org.omg.CORBA.Object obj
+ = m_pORB.resolve_initial_references("omniINSPOA");
+ POA poa = POAHelper.narrow(obj);
+ poa.deactivate_object(poa.servant_to_id(this));
} catch(Exception ex) {
}
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -567,7 +567,17 @@
new NVListHolder(connector_profile.value.properties);
NVUtil.copyToProperties(prop, nvholder);
- String _str = m_properties.getProperty("dataport.fan_in");
+
+ Properties node = prop.getNode("dataport.inport");
+ Properties portprop = new Properties(m_properties);
+ portprop.merge(node);
+ node.merge(portprop);
+ NVListHolder holder = new NVListHolder(new NameValue[0]);
+ NVUtil.copyFromProperties(holder,prop);
+ connector_profile.value.properties = holder.value;
+
+ String _str = node.getProperty("fan_out");
+
int _type = 100;
try {
_type = Integer.parseInt(_str);
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -557,7 +557,15 @@
new NVListHolder(connector_profile.value.properties);
NVUtil.copyToProperties(prop, nvholder);
- String _str = m_properties.getProperty("dataport.fan_out");
+ Properties node = prop.getNode("dataport.outport");
+ Properties portprop = new Properties(m_properties);
+ portprop.merge(node);
+ node.merge(portprop);
+ NVListHolder holder = new NVListHolder(new NameValue[0]);
+ NVUtil.copyFromProperties(holder,prop);
+ connector_profile.value.properties = holder.value;
+
+ String _str = node.getProperty("fan_out");
int _type = 100;
try {
_type = Integer.parseInt(_str);
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java 2018-03-30 04:20:28 UTC (rev 1127)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java 2018-03-30 05:15:38 UTC (rev 1128)
@@ -732,7 +732,7 @@
new NVListHolder(this.m_profile.properties);
NVUtil.copyToProperties(prop, nvholder);
boolean default_value = StringUtil.toBool(
- prop.getProperty("dataport.allow_dup_connection"),
+ prop.getProperty("allow_dup_connection"),
"YES", "NO", false);
prop = new Properties();
openrtm-commit メーリングリストの案内