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

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 8月 28日 (月) 15:52:22 JST


Author: t-katami
Date: 2017-08-28 15:52:22 +0900 (Mon, 28 Aug 2017)
New Revision: 1027

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-25 08:18:00 UTC (rev 1026)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/CorbaConsumer.java	2017-08-28 06:52:22 UTC (rev 1027)
@@ -69,25 +69,6 @@
      */
     public OBJECT_TYPE _ptr() {
 
-        if(this.m_sev != null){
-            return this.m_sev;
-        }
-        if(this.m_var != null){
-            return this.m_var;
-        }
-     
-        try{
-            if(Manager.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){
-            return this.m_var;
-        }        
         return this.m_var;
 
     }



More information about the openrtm-commit mailing list