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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-09-15 16:07:39 +0900 (Fri, 15 Sep 2017)
New Revision: 1048

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
[compat,newfunc->releng_1_2] When manager_name is not designated, a slave manager starts it by the manager_\<process number\>.  refs #4187

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	2017-09-15 05:32:51 UTC (rev 1047)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2017-09-15 07:07:39 UTC (rev 1048)
@@ -1585,11 +1585,11 @@
                     //do nothing
                 }
             }
-            if (mgrobj == null) {
-                rtcout.println(Logbuf.WARN, "Manager cannot be found.");
-                return null;
-            }
         }
+        if (mgrobj == null) {
+            rtcout.println(Logbuf.WARN, "Manager cannot be found.");
+            return null;
+        }
         rtcout.println(Logbuf.DEBUG, "Creating component on "+mgrstr);
         rtcout.println(Logbuf.DEBUG, "arg: "+arg);
         try {