[openrtm-commit:02787] r1031 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-30 15:00:06 +0900 (Wed, 30 Aug 2017)
New Revision: 1031

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/CORBA_RTCUtil.java
Log:
[compat,bugfix,->releng_1_2] fixed the bug. refs #3385

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/CORBA_RTCUtil.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/CORBA_RTCUtil.java	2017-08-30 02:03:21 UTC (rev 1030)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/CORBA_RTCUtil.java	2017-08-30 06:00:06 UTC (rev 1031)
@@ -59,7 +59,7 @@
      * coil::Properties get_component_profile(const RTC::RTObject_ptr rtc)
      */
     public static Properties get_component_profile(final RTObject rtc){
-            if(rtc == null){
+        if(rtc == null){
             return null;
         }
         ComponentProfile cprofs = rtc.get_component_profile();
@@ -221,6 +221,9 @@
         if(rtc == null){
             return -1;
         }
+        if(ec == null){
+            return -1;
+        }
         ExecutionContext[] eclist = rtc.get_owned_contexts();
   
         for(int ic=0;ic<eclist.length;++ic){
@@ -1583,7 +1586,6 @@
      *
      */
     public static PortService get_port_by_url(String port_name){
-        System.out.println("get_port_by_url:"+port_name);
         Manager mgr = Manager.instance();
         NamingManager nm = mgr.getNaming();
         String[] ports  = port_name.split("\\.");