[openrtm-commit:03324] r1126 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2018-03-29 16:39:41 +0900 (Thu, 29 Mar 2018)
New Revision: 1126

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
Log:
[compat,->RELENG_1_2] Added to remove  members of composite component to exit(). refs #4477

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2018-03-29 07:16:17 UTC (rev 1125)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2018-03-29 07:39:41 UTC (rev 1126)
@@ -827,6 +827,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()));