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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-09-22 14:10:40 +0900 (Fri, 22 Sep 2017)
New Revision: 1051

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.

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-09-20 07:47:58 UTC (rev 1050)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-09-22 05:10:40 UTC (rev 1051)
@@ -597,13 +597,8 @@
                         Object obj, final boolean force)
         throws SystemException, NotFound, CannotProceed, InvalidName {
 
-
         try {
-            if( isNamingContext(obj) ) {
-                m_rootContext.rebind(name, NamingContextExtHelper.narrow(obj));
-            } else {
-                m_rootContext.rebind(name, obj);
-            }
+            m_rootContext.rebind(name, obj);
         } catch(NotFound ex) {
             if( force ) {
                 rebindRecursive(m_rootContext, name, obj);
@@ -1877,6 +1872,24 @@
                 name[intIdx].kind = "";
             }
         }
+/*
+        NameComponent[] nametest = m_rootContext.to_name(sname);
+        if(name.length!=nametest.length){
+            System.out.println("\u001b[00;32m"+"CorbaNaming:toName():");
+            System.out.println("length:"+name.length+","+nametest.length);
+        }
+        else{
+            for(int ic=0;ic<name.length;++ic){
+                if(!name[ic].id.equals(nametest[ic].id) 
+                || !name[ic].kind.equals(nametest[ic].kind)){ 
+                    System.out.println("\u001b[00;32m"+"CorbaNaming:toName():");
+                    System.out.println(ic+":"+name[ic].id+","+name[ic].kind);
+                    System.out.println(
+                            ic+":"+nametest[ic].id+","+nametest[ic].kind);
+                }
+            }
+        }
+*/
         return name;
     }