[openrtm-commit:00479] r595 - branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-12-08 13:30:12 +0900 (Thu, 08 Dec 2011)
New Revision: 595

Modified:
   branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
The processing created CORBA Object was made a private method.   

Modified: branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
===================================================================
--- branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2011-12-07 08:36:43 UTC (rev 594)
+++ branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2011-12-08 04:30:12 UTC (rev 595)
@@ -59,11 +59,7 @@
 
             try{
                 //Registers the reference
-                m_mgr.getPOA().activate_object( this );
-                com.sun.corba.se.impl.orb.ORBImpl orb 
-                        = (com.sun.corba.se.impl.orb.ORBImpl)m_mgr.getORB();
-                orb.register_initial_reference( 
-                        "manager", m_mgr.getPOA().servant_to_reference(this) );
+                createManagerCORBAServant();
             }
             catch(Exception ex){
                  rtcout.println(Logbuf.WARN, 
@@ -105,11 +101,7 @@
 
                 try{
                     //Registers the reference
-                    m_mgr.getPOA().activate_object( this );
-                    com.sun.corba.se.impl.orb.ORBImpl orb 
-                        = (com.sun.corba.se.impl.orb.ORBImpl)m_mgr.getORB();
-                    orb.register_initial_reference( 
-                        "manager", m_mgr.getPOA().servant_to_reference(this) );
+                    createManagerCORBAServant();
                 }
                 catch(Exception ex){
                      rtcout.println(Logbuf.WARN, 
@@ -179,14 +171,6 @@
 
         rtcout.println(Logbuf.DEBUG, "createINSManager()");
         try{
-/*
-            //Registers the reference
-            m_mgr.getPOA().activate_object( this );
-            com.sun.corba.se.impl.orb.ORBImpl orb 
-                        = (com.sun.corba.se.impl.orb.ORBImpl)m_mgr.getORB();
-            orb.register_initial_reference( 
-                        "manager", m_mgr.getPOA().servant_to_reference(this) );
-*/
 
             //
             rtcout.println(Logbuf.DEBUG, "gets object.");
@@ -1227,6 +1211,18 @@
 */
 
     /**
+     * 
+     */
+    private void createManagerCORBAServant() throws Exception {
+        m_mgr.getPOA().activate_object( this );
+        com.sun.corba.se.impl.orb.ORBImpl orb 
+                = (com.sun.corba.se.impl.orb.ORBImpl)m_mgr.getORB();
+//        org.jacorb.orb.ORB orb
+//                = (org.jacorb.orb.ORB)m_mgr.getORB();
+        orb.register_initial_reference( 
+                "manager", m_mgr.getPOA().servant_to_reference(this) );
+    }
+    /**
      * <p></p>
      */
     private jp.go.aist.rtm.RTC.Manager m_mgr;