You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/06 18:18:22 UTC
svn commit: r1629699 -
/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Author: rmannibucau
Date: Mon Oct 6 16:18:21 2014
New Revision: 1629699
URL: http://svn.apache.org/r1629699
Log:
reducing potential locks
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1629699&r1=1629698&r2=1629699&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Mon Oct 6 16:18:21 2014
@@ -155,13 +155,15 @@ public class JuliLogStreamFactory implem
public String getProperty(final String name) {
final String parentValue = super.getProperty(name);
- if (SystemInstance.get().getProperties().containsKey(name)) {
- return SystemInstance.get().getProperty(name);
- }
+ if (SystemInstance.isInitialized()) {
+ if (SystemInstance.get().getProperties().containsKey(name)) {
+ return SystemInstance.get().getProperty(name);
+ }
- final String propertyKeyValue = "logging" + reverseProperty(name);
- if (SystemInstance.get().getProperties().containsKey(propertyKeyValue)) {
- return SystemInstance.get().getProperty(propertyKeyValue);
+ final String propertyKeyValue = "logging" + reverseProperty(name);
+ if (SystemInstance.get().getProperties().containsKey(propertyKeyValue)) {
+ return SystemInstance.get().getProperty(propertyKeyValue);
+ }
}
// if it is one of ours loggers and no value is defined let set our nice logging style
@@ -176,17 +178,18 @@ public class JuliLogStreamFactory implem
}
return parentValue;
}
+ }
- private static String reverseProperty(final String name) {
- if (name.contains(".") && !name.endsWith(".")) {
- final int idx = name.lastIndexOf('.');
- return name.substring(idx) + "." + name.substring(0, idx);
- }
- return name;
+ private static String reverseProperty(final String name) {
+ if (name.contains(".") && !name.endsWith(".")) {
+ final int idx = name.lastIndexOf('.');
+ return name.substring(idx) + "." + name.substring(0, idx);
}
+ return name;
+ }
- private static boolean isOverridableLogger(final String name) {
- return useOpenEJBHandler
+ private static boolean isOverridableLogger(final String name) {
+ return useOpenEJBHandler
|| name.toLowerCase().contains("openejb")
|| name.toLowerCase().contains("transaction")
|| name.toLowerCase().contains("cxf")
@@ -196,7 +199,6 @@ public class JuliLogStreamFactory implem
|| name.startsWith("net.sf.ehcache.")
|| name.startsWith("org.quartz.")
|| name.startsWith("org.hibernate.");
- }
}
public static class OpenEJBSimpleLayoutHandler extends ConsoleHandler {