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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-10-27 11:19:40 +0900 (Fri, 27 Oct 2017)
New Revision: 1069

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
Log:
[compat,bugfix->releng_1_2] Fixed the bug. refs #4351

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-10-26 08:33:02 UTC (rev 1068)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-10-27 02:19:40 UTC (rev 1069)
@@ -733,7 +733,13 @@
         
         for( int intIdx=0;intIdx<len;intIdx++ ) {
             if( intIdx==(len-1) ) {
-                cxt.rebind(subName(name, intIdx, intIdx), obj);
+                if(obj instanceof org.omg.CosNaming.NamingContext){
+                    cxt.rebind_context(subName(name, intIdx, intIdx), 
+                                       NamingContextExtHelper.narrow(obj));
+                }
+                else{
+                    cxt.rebind(subName(name, intIdx, intIdx), obj);
+                }
                 return;
             }
             // If the context is not a NamingContext, CannotProceed is thrown