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

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-05-20 14:46:39 +0900 (Fri, 20 May 2016)
New Revision: 822

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
Fiexd bugs. refs #3398

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2016-05-06 05:04:06 UTC (rev 821)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2016-05-20 05:46:39 UTC (rev 822)
@@ -1,5 +1,6 @@
 package jp.go.aist.rtm.RTC;
 
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -1135,6 +1136,13 @@
      *   {@.en Manager reference}
      */
     public RTM.Manager getObjRef() {
+        if (m_objref == null) {
+            try {
+                m_objref = ManagerHelper.narrow(POAUtil.getRef(this));
+            } catch (Exception e) {
+                throw new IllegalStateException(e);
+            }
+        }
         return (RTM.Manager)m_objref;
     }
 
@@ -1631,7 +1639,8 @@
         }
 */
         public boolean equalof(final java.lang.Object object) {
-            return m_mgr._is_equivalent((RTM.Manager)object);
+            boolean ret = m_mgr._is_equivalent((RTM.Manager)object);
+            return ret;
         }
     }
 }