[openrtm-commit:02756] r1016 - in 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 16:58:12 +0900 (Thu, 17 Aug 2017)
New Revision: 1016

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/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/NamingOnCorba.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2017-08-17 07:40:20 UTC (rev 1015)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2017-08-17 07:58:12 UTC (rev 1016)
@@ -293,15 +293,20 @@
                             cns = m_cosnaming;
                         }
                         else{
-                            Manager mgr  = Manager.instance();
-                            if(mgr==null){
-                                return null;
+                            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);
                             }
-                            ORB orb = mgr.getORB();
-                            if(orb==null){
+                            else{
                                 return null;
                             }
-                            cns = new CorbaNaming(orb,host);
                         }
                         String[] names = rtc_name.split("/");
             

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 07:40:20 UTC (rev 1015)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/CorbaConsumer.java	2017-08-17 07:58:12 UTC (rev 1016)
@@ -77,7 +77,7 @@
         }
      
         try{
-            if(!Manager.instance().isActive()){
+            if(Manager.isActive()){
                 POA poa = Manager.instance().getPOA();
                 m_sev = (OBJECT_TYPE)(poa.reference_to_servant((Object)m_var));
                 if(m_sev != null){