Author: rmannibucau Date: Thu Oct 9 15:52:59 2014 New Revision: 1630518 URL: http://svn.apache.org/r1630518 Log: we shouldn't loose system props configs when we add few configuration in container properties even for logging
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1630518&r1=1630517&r2=1630518&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original) +++ tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Thu Oct 9 15:52:59 2014 @@ -290,7 +290,10 @@ public class Container implements AutoCl final Properties props = configuration.getProperties(); if (props != null) { - Logger.configure(configuration.getProperties()); + // inherit from system props + final Properties properties = new Properties(System.getProperties()); + properties.putAll(configuration.getProperties()); + Logger.configure(properties); } else { Logger.configure(); }