[openrtm-commit:02742] r1003 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src: RTMExamples/ExtTrigger jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-16 10:18:28 +0900 (Wed, 16 Aug 2017)
New Revision: 1003

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleInImpl.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleOutImpl.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java
Log:
[compat,bugfix,->RELENG_1_2] Fixed the items pointed out by the static code analysis tool.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleInImpl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleInImpl.java	2017-08-10 08:08:45 UTC (rev 1002)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleInImpl.java	2017-08-16 01:18:28 UTC (rev 1003)
@@ -98,7 +98,7 @@
     protected ReturnCode_t onExecute(int ec_id) {
 //        m_count++;
 //        System.out.println("Please input number: " + m_count);
-        System.out.println("Please input number: ");
+        System.out.print("Please input number: ");
         BufferedReader buff = new BufferedReader(new InputStreamReader( System.in ));
         try {
             String str = buff.readLine();
@@ -115,7 +115,7 @@
         System.out.println("Sending to subscriber: "  + m_out.data);
         m_outOut.write();
 
-        return ReturnCode_t.RTC_OK;
+        return super.onExecute(ec_id);
     }
     //
     // The aborting action when main logic error occurred.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleOutImpl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleOutImpl.java	2017-08-10 08:08:45 UTC (rev 1002)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples/ExtTrigger/ConsoleOutImpl.java	2017-08-16 01:18:28 UTC (rev 1003)
@@ -102,7 +102,7 @@
             e.printStackTrace();
         }
 
-        return ReturnCode_t.RTC_OK;
+        return super.onExecute(ec_id);
     }
     //
     // The aborting action when main logic error occurred.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2017-08-10 08:08:45 UTC (rev 1002)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2017-08-16 01:18:28 UTC (rev 1003)
@@ -462,7 +462,6 @@
                 NamingOnCorba nameb 
                     = new NamingOnCorba(m_manager.getORB(), name_server);
                 NamingBase name = nameb;
-                if( name == null ) return null;
                 rtcout.println(Logbuf.INFO, 
                     "NameServer connection succeeded: " 
                     + method + "/" + name_server);