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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-18 17:40:26 +0900 (Fri, 18 Aug 2017)
New Revision: 1022

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.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/NamingOnCorba.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2017-08-18 07:10:19 UTC (rev 1021)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2017-08-18 08:40:26 UTC (rev 1022)
@@ -4,6 +4,7 @@
 import jp.go.aist.rtm.RTC.port.CorbaConsumer;
 import jp.go.aist.rtm.RTC.port.PortBase;
 import jp.go.aist.rtm.RTC.util.CORBA_SeqUtil;
+import jp.go.aist.rtm.RTC.util.ORBUtil;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
@@ -293,20 +294,8 @@
                             cns = m_cosnaming;
                         }
                         else{
-                            if(Manager.isActive()){
-                                Manager mgr  = Manager.instance();
-                                if(mgr==null){
-                                    return null;
-                                }
-                                ORB orb = mgr.getORB();
-                                if(orb==null){
-                                    return null;
-                                }
-                                cns = new CorbaNaming(orb,host);
-                            }
-                            else{
-                                return null;
-                            }
+                            ORB orb = ORBUtil.getOrb();
+                            cns = new CorbaNaming(orb,host);
                         }
                         String[] names = rtc_name.split("/");