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

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-10-10 20:14:47 +0900 (Mon, 10 Oct 2016)
New Revision: 844

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
Fixed  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-10-10 06:18:01 UTC (rev 843)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2016-10-10 11:14:47 UTC (rev 844)
@@ -699,10 +699,13 @@
      *
      */
     public RTC.ComponentProfile[] get_component_profiles() {
+System.out.println("- 2016/10/9 05100 -");
         rtcout.println(Logbuf.TRACE, "get_component_profiles()");
 
         ComponentProfileListHolder cprofs = new ComponentProfileListHolder();
+System.out.println("- 2016/10/9 05200 -");
         Vector<RTObject_impl> rtcs = m_mgr.getComponents();
+System.out.println("- 2016/10/9 05300 -  rtcs.size()="+rtcs.size());
         cprofs.value = new ComponentProfile[rtcs.size()];
 
         for (int i=0, len=rtcs.size(); i < len; ++i) {
@@ -712,6 +715,7 @@
         synchronized(m_slaveMutex) {
             rtcout.println(Logbuf.DEBUG,
                                     m_slaves.length+" slaves exists.");
+System.out.println("- 2016/10/9 05400 -  m_slaves.length="+m_slaves.length);
             for (int i=0, len=m_slaves.length; i < len; ++i) {
                 try {
                     if (m_slaves[i]!=null) {
@@ -737,6 +741,7 @@
                 m_slaves = holder.value;
             }
         }
+System.out.println("- 2016/10/9 05e00 -  cprofs.value="+cprofs.value);
         return cprofs.value;
     }
 
@@ -1398,6 +1403,9 @@
         String mgrstr = get_parameter_by_modulename("manager_name",tmp);
         arg = tmp[0];
 
+        if(mgrstr==null){
+            return null;
+        }
         if(mgrstr.isEmpty()){
             return null;
         }
@@ -1408,6 +1416,9 @@
         String language = get_parameter_by_modulename("language",tmp);
         arg = tmp[0];
 
+        if(language==null){
+            language = "Java";
+        }
         if(language.isEmpty()){
             language = "Java";
         }
@@ -1524,6 +1535,9 @@
         String mgrstr = get_parameter_by_modulename("manager_address",tmp);
         arg = tmp[0];
 
+        if(mgrstr==null){
+            return null;
+        }
         if(mgrstr.isEmpty()){
             return null;
         }
@@ -1540,6 +1554,9 @@
         String language = get_parameter_by_modulename("language",tmp);
         arg = tmp[0];
 
+        if(language==null){
+            language = "Java";
+        }
         if(language.isEmpty()){
             language = "Java";
         }