[Title] fix log configuration when workspace first start.

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: If7ff8dce0862df5f7cd987aa8ecb4d123832efb8

diff --git a/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java b/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
index 20bfdb9..b6ffd4e 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
+++ b/org.tizen.common/src/org/tizen/common/ui/page/preference/TizenBasePreferencePage.java
@@ -356,9 +356,11 @@ public class TizenBasePreferencePage extends FieldEditorPreferencePage implement
         if(StringUtil.isEmpty(levelString)) {
             levelString = prefStore.getString(OPTION_ID_LEVEL);
         }
-        for(Level level: LEVELS) {
-            if(level.toString().equals(levelString)) {
-                return level;
+        if(!StringUtil.isEmpty(levelString)) {
+            for(Level level: LEVELS) {
+                if(level.toString().equals(levelString)) {
+                    return level;
+                }
             }
         }
         return LEVELS[DEFAULT_LEVEL];

diff --git a/org.tizen.common/src/org/tizen/common/util/log/TizenLog4jConfigurator.java b/org.tizen.common/src/org/tizen/common/util/log/TizenLog4jConfigurator.java
index 3e7ccaa..7b34a0d 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/util/log/TizenLog4jConfigurator.java
+++ b/org.tizen.common/src/org/tizen/common/util/log/TizenLog4jConfigurator.java
@@ -68,6 +68,7 @@ public class TizenLog4jConfigurator extends DOMConfigurator implements IProperty
         Logger rootLogger = arg1.getRootLogger();
         rootLogger.removeAllAppenders();
         rootLogger.setLevel(TizenBasePreferencePage.getLoggerLevel());
+        layout.setConversionPattern(TizenBasePreferencePage.getLogConversionPattern());
         
         MDC.put(LoggerConstants.KEY_WORKSPACE, ResourcesPlugin.getWorkspace().getRoot().getLocation().toString());
         MDC.put(LoggerConstants.KEY_SDK_HOME, InstallPathConfig.getSDKPath());