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

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-12-07 17:36:43 +0900 (Wed, 07 Dec 2011)
New Revision: 594

Modified:
   branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
Changed the character strings(com.sun.CORBA.ORBServerHost,com.sun.CORBA.ORBServerPort,com.sun.CORBA.POA.ORBPersistentServerPort) to the final definition.  

Modified: branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-12-07 05:47:08 UTC (rev 593)
+++ branches/work/SourceSharing/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-12-07 08:36:43 UTC (rev 594)
@@ -2182,12 +2182,12 @@
         if(endpoint != null && (endpoint.indexOf(":")>=0))  {
             String[] endPointInfo = endpoint.split(":");
             if( !endPointInfo[0].equals("") ) {
-                result.put("com.sun.CORBA.ORBServerHost", endPointInfo[0]);
+                result.put(SERVER_HOST, endPointInfo[0]);
             }
             if( endPointInfo.length>1 ) {
                 try {
                     short port = (short)Integer.parseInt(endPointInfo[1]);
-                    result.put("com.sun.CORBA.ORBServerPort", endPointInfo[1]);
+                    result.put(SERVER_PORT, endPointInfo[1]);
                 }
                 catch(Exception ex){
                     rtcout.println(Logbuf.WARN, ""+endPointInfo[1]);
@@ -2216,7 +2216,7 @@
                                             "localhost:2810");
 
             String portNumber[] = mm.split(":");
-            result.put("com.sun.CORBA.POA.ORBPersistentServerPort",
+            result.put(LISTENER_PORT,
                                                             portNumber[1]);
         }
 
@@ -2271,7 +2271,7 @@
                 String[] endPoints = endpoints.split(",");
                 int loopstart = 0;
                 for(int ic=loopstart;ic<endPoints.length;++ic) {
-                    if(result.getProperty("com.sun.CORBA.ORBServerHost")==null){
+                    if(result.getProperty(SERVER_HOST)==null){
                         parsesCorbaEndpoint(endPoints[ic], result);
                     }
                     else{
@@ -2283,7 +2283,7 @@
             
             }
             else{
-                if(result.getProperty("com.sun.CORBA.ORBServerHost")==null){
+                if(result.getProperty(SERVER_HOST)==null){
                     parsesCorbaEndpoint(endpoints, result);
                 }
                 else {
@@ -3471,4 +3471,11 @@
      * 
      */
     Finalized m_finalized = new Finalized();
+
+    private static final String SERVER_HOST = "com.sun.CORBA.ORBServerHost";
+    private static final String SERVER_PORT = "com.sun.CORBA.ORBServerPort";
+    private static final String LISTENER_PORT = "com.sun.CORBA.POA.ORBPersistentServerPort";
+    //private static final String SERVER_HOST = "OAIAddr";
+    //private static final String SERVER_PORT = "OAPort";
+    //private static final String LISTENER_PORT = "OAPort";
 }