[openrtm-commit:02744] r1005 - 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-16 13:22:10 +0900 (Wed, 16 Aug 2017)
New Revision: 1005

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.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/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-16 02:01:07 UTC (rev 1004)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-16 04:22:10 UTC (rev 1005)
@@ -1466,31 +1466,31 @@
                                  CORBA_SeqUtil.refToVstring(cprof.value.ports),
                                  prop); 
         InPortConnector connector = null;
-        synchronized (m_connectors){
-            try {
-                if (m_singlebuffer) {
-                    connector = new InPortPushConnector(profile, provider,
-                                                    m_listeners,m_thebuffer);
-                }
-                else {
-                    BufferBase<OutputStream> buffer = null;
-                    connector = new InPortPushConnector(profile, provider, 
-                                                        m_listeners,buffer);
-                }
-    
-                rtcout.println(Logbuf.TRACE, "InPortPushConnector created");
-    
+        try {
+            if (m_singlebuffer) {
+                connector = new InPortPushConnector(profile, provider,
+                                                m_listeners,m_thebuffer);
+            }
+            else {
+                BufferBase<OutputStream> buffer = null;
+                connector = new InPortPushConnector(profile, provider, 
+                                                    m_listeners,buffer);
+            }
+
+            rtcout.println(Logbuf.TRACE, "InPortPushConnector created");
+
+            synchronized (m_connectors){
                 m_connectors.add(connector);
                 rtcout.println(Logbuf.PARANOID, 
-                               "connector push backed: "+m_connectors.size());
-                return connector;
+                           "connector push backed: "+m_connectors.size());
             }
-            catch (Exception e) {
-                rtcout.println(Logbuf.ERROR,
-                               "InPortPushConnector creation failed");
-                return null;
-            }
+            return connector;
         }
+        catch (Exception e) {
+            rtcout.println(Logbuf.ERROR,
+                           "InPortPushConnector creation failed");
+            return null;
+        }
     }
     /**
      * {@.ja InPortPullConnector の生成}