[openrtm-commit:02752] r1012 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-17 13:30:52 +0900 (Thu, 17 Aug 2017)
New Revision: 1012

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/CorbaConsumer.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/jp/go/aist/rtm/RTC/port/CorbaConsumer.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/CorbaConsumer.java	2017-08-17 02:02:21 UTC (rev 1011)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/CorbaConsumer.java	2017-08-17 04:30:52 UTC (rev 1012)
@@ -77,10 +77,12 @@
         }
      
         try{
-            POA poa = Manager.instance().getPOA();
-            m_sev = (OBJECT_TYPE)(poa.reference_to_servant((Object)m_var));
-            if(m_sev != null){
-                return this.m_sev;
+            if(!Manager.instance().isActive()){
+                POA poa = Manager.instance().getPOA();
+                m_sev = (OBJECT_TYPE)(poa.reference_to_servant((Object)m_var));
+                if(m_sev != null){
+                    return this.m_sev;
+                }
             }
         }
         catch(Exception ex){