[openrtm-commit:03323] r1125 - 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:16:17 +0900 (Thu, 29 Mar 2018)
New Revision: 1125

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 deactivate of omniINSPOA object to the shutdown processing. 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 06:42:39 UTC (rev 1124)
+++ 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)
@@ -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.DataFlowFiniteStateMachineComponent;
 //import OpenRTM.DataFlowFiniteStateMachineComponentHelper;
@@ -6290,6 +6291,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) {
         }