[openrtm-commit:02736] r1001 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . port

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-10 13:53:40 +0900 (Thu, 10 Aug 2017)
New Revision: 1001

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ConfigAdmin.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
   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/port/InPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.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/jp/go/aist/rtm/RTC/ConfigAdmin.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ConfigAdmin.java	2017-08-10 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ConfigAdmin.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -755,7 +755,6 @@
         Properties prop = m_configsets.getNode(m_activeId);
         if( prop == null ) return m_emptyconf;
         Properties p = new Properties(prop);
-        if( p == null ) return m_emptyconf;
         return p;
     }
 

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-08-10 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -1556,19 +1556,16 @@
             }
     
             // no more binding -> do-while loop will be finished
-            if( bi==null ) cont = false;
-            else {
-                if( bi.value!=null ) {
-                    if( bi.value.next_n(m_blLength, bl) == false )
-                        return;
-                } else {
+            if( bi.value!=null ) {
+                if( bi.value.next_n(m_blLength, bl) == false )
                     return;
-                }
-	    }
+            } else {
+                return;
+            }
         }
       
-      if( bi!=null ) bi.value.destroy();
-      return;
+        bi.value.destroy();
+        return;
     }
 
     /**

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-08-10 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -1632,9 +1632,6 @@
         
         try {
             ECFactoryBase factory = new ECFactoryJava(name);
-            if( factory == null ) {
-                return false;
-            }
             if( !m_ecfactory.registerObject(factory, new ECFactoryPredicate(factory))) {
                 factory = null;
                 return false;

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 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -476,9 +476,6 @@
         }
         else if( m.endsWith("manager")) {
             NamingBase name = new NamingOnManager(m_manager.getORB(),m_manager);
-            if( name == null ) {
-                return null;
-            }
             return name;
         }
         return null;

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-10 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -1478,11 +1478,6 @@
                                                         m_listeners,buffer);
                 }
     
-                if (connector == null) {
-                    rtcout.println(Logbuf.ERROR, 
-                                   "old compiler? new returned 0;");
-                    return null;
-                }
                 rtcout.println(Logbuf.TRACE, "InPortPushConnector created");
     
                 m_connectors.add(connector);
@@ -1531,11 +1526,6 @@
                                                         buffer);
                 }
 
-                if (connector == null) {
-                    rtcout.println(Logbuf.ERROR, 
-                                   "old compiler? new returned 0;");
-                    return null;
-                }
                 rtcout.println(Logbuf.TRACE, "InPortPullConnector created");
                 
                 String type = prop.getProperty("interface_type").trim();

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-08-10 03:12:11 UTC (rev 1000)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-08-10 04:53:40 UTC (rev 1001)
@@ -1633,11 +1633,6 @@
                 connector = new OutPortPushConnector(profile, consumer, 
                                                         m_listeners, buffer);
 
-                if (connector == null) {
-                    rtcout.println(Logbuf.ERROR, 
-                                   "old compiler? new returned 0;");
-                    return null;
-                }
                 rtcout.println(Logbuf.TRACE, "OutPortPushConnector created");
     
                 String type = prop.getProperty("interface_type").trim();