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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-07-26 17:20:53 +0900 (Wed, 26 Jul 2017)
New Revision: 982

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

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-07-26 08:01:25 UTC (rev 981)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-07-26 08:20:53 UTC (rev 982)
@@ -182,24 +182,22 @@
      */
     public static Manager init(String[] argv) {
         
-        if (manager == null) {
-            synchronized (manager_mutex) {
-                if (manager == null) {
-                    try {
-                        manager = new Manager();
-                        manager.initManager(argv);
-                        manager.initLogger();
-                        manager.initORB();
-                        manager.initNaming();
-                        manager.initFactories();
-                        manager.initExecContext();
-                        manager.initComposite();
-                        manager.initTimer();
-                        manager.initManagerServant();
-                        
-                    } catch (Exception e) {
-                        manager = null;
-                    }
+        synchronized (manager_mutex) {
+            if (manager == null) {
+                try {
+                    manager = new Manager();
+                    manager.initManager(argv);
+                    manager.initLogger();
+                    manager.initORB();
+                    manager.initNaming();
+                    manager.initFactories();
+                    manager.initExecContext();
+                    manager.initComposite();
+                    manager.initTimer();
+                    manager.initManagerServant();
+                    
+                } catch (Exception e) {
+                    manager = null;
                 }
             }
         }
@@ -226,23 +224,21 @@
      */ 
     public static Manager instance() {
         
-        if (manager == null) {
-            synchronized (manager_mutex) {
-                if (manager == null) {
-                    try {
-                        manager = new Manager();
-                        manager.initManager(null);
-                        manager.initLogger();
-                        manager.initORB();
-                        manager.initNaming();
-                        manager.initFactories();
-                        manager.initExecContext();
-                        manager.initComposite();
-                        manager.initTimer();
-                        
-                    } catch (Exception e) {
-                        manager = null;
-                    }
+        synchronized (manager_mutex) {
+            if (manager == null) {
+                try {
+                    manager = new Manager();
+                    manager.initManager(null);
+                    manager.initLogger();
+                    manager.initORB();
+                    manager.initNaming();
+                    manager.initFactories();
+                    manager.initExecContext();
+                    manager.initComposite();
+                    manager.initTimer();
+                    
+                } catch (Exception e) {
+                    manager = null;
                 }
             }
         }