From 93515d8ddb156750aa1a31c4efde8d0f53a8261d Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 17 Mar 2014 23:38:57 +0000
Subject: [PATCH] From coverity: synchronize FileAppender creation

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2262 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/Settings.java | 49 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/java/davmail/Settings.java b/src/java/davmail/Settings.java
index 50d42b2a..185be82a 100644
--- a/src/java/davmail/Settings.java
+++ b/src/java/davmail/Settings.java
@@ -238,7 +238,6 @@ public final class Settings {
     public static void updateLoggingConfig() {
         String logFilePath = getLogFilePath();
 
-        Logger rootLogger = Logger.getRootLogger();
         try {
             if (logFilePath != null && logFilePath.length() > 0) {
                 File logFile = new File(logFilePath);
@@ -253,31 +252,33 @@ public final class Settings {
             } else {
                 logFilePath = "davmail.log";
             }
-            // Build file appender
-            FileAppender fileAppender = (FileAppender) rootLogger.getAppender("FileAppender");
-            if (fileAppender == null) {
-                String logFileSize = Settings.getProperty("davmail.logFileSize");
-                if (logFileSize == null || logFileSize.length() == 0) {
-                    logFileSize = "1MB";
+            synchronized (Logger.getRootLogger()) {
+                // Build file appender
+                FileAppender fileAppender = (FileAppender) Logger.getRootLogger().getAppender("FileAppender");
+                if (fileAppender == null) {
+                    String logFileSize = Settings.getProperty("davmail.logFileSize");
+                    if (logFileSize == null || logFileSize.length() == 0) {
+                        logFileSize = "1MB";
+                    }
+                    // set log file size to 0 to use an external rotation mechanism, e.g. logrotate
+                    if ("0".equals(logFileSize)) {
+                        fileAppender = new FileAppender();
+                    } else {
+                        fileAppender = new RollingFileAppender();
+                        ((RollingFileAppender) fileAppender).setMaxBackupIndex(2);
+                        ((RollingFileAppender) fileAppender).setMaxFileSize(logFileSize);
+                    }
+                    fileAppender.setName("FileAppender");
+                    fileAppender.setEncoding("UTF-8");
+                    fileAppender.setLayout(new PatternLayout("%d{ISO8601} %-5p [%t] %c %x - %m%n"));
                 }
-                // set log file size to 0 to use an external rotation mechanism, e.g. logrotate
-                if ("0".equals(logFileSize)) {
-                    fileAppender = new FileAppender();
-                } else {
-                    fileAppender = new RollingFileAppender();
-                    ((RollingFileAppender)fileAppender).setMaxBackupIndex(2);
-                    ((RollingFileAppender)fileAppender).setMaxFileSize(logFileSize);
-                }
-                fileAppender.setName("FileAppender");
-                fileAppender.setEncoding("UTF-8");
-                fileAppender.setLayout(new PatternLayout("%d{ISO8601} %-5p [%t] %c %x - %m%n"));
+                fileAppender.setFile(logFilePath, true, false, 8192);
+                Logger.getRootLogger().addAppender(fileAppender);
             }
-            fileAppender.setFile(logFilePath, true, false, 8192);
-            rootLogger.addAppender(fileAppender);
 
             // disable ConsoleAppender in gui mode
             if (!Settings.getBooleanProperty("davmail.server")) {
-                ConsoleAppender consoleAppender = (ConsoleAppender) rootLogger.getAppender("ConsoleAppender");
+                ConsoleAppender consoleAppender = (ConsoleAppender) Logger.getRootLogger().getAppender("ConsoleAppender");
                 if (consoleAppender != null) {
                     consoleAppender.setThreshold(Level.OFF);
                 }
@@ -474,7 +475,7 @@ public final class Settings {
     /**
      * Get all properties that are in the specified scope, that is, that start with '&lt;scope&gt;.'.
      *
-     * @param scope     start of property name
+     * @param scope start of property name
      * @return properties
      */
     public static synchronized Properties getSubProperties(String scope) {
@@ -488,9 +489,9 @@ public final class Settings {
         }
         Properties result = new Properties();
         for (Map.Entry entry : SETTINGS.entrySet()) {
-            String key = (String)entry.getKey();
+            String key = (String) entry.getKey();
             if (key.startsWith(keyStart)) {
-                String value = (String)entry.getValue();
+                String value = (String) entry.getValue();
                 result.setProperty(key.substring(keyStart.length()), value);
             }
         }