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 2012/02/07 15:44:03 UTC

svn commit: r1241477 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

Author: rmannibucau
Date: Tue Feb  7 14:44:02 2012
New Revision: 1241477

URL: http://svn.apache.org/viewvc?rev=1241477&view=rev
Log:
in TempClassLoader shouldnt skip log4j if it is not available

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1241477&r1=1241476&r2=1241477&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Tue Feb  7 14:44:02 2012
@@ -43,6 +43,16 @@ import java.util.Set;
  */
 // Note: this class is a fork from OpenJPA
 public class TempClassLoader extends URLClassLoader {
+    private static boolean skipLog4j = false;
+
+    static {
+        try {
+            TempClassLoader.class.getClassLoader().loadClass("org.apache.log4j.Logger");
+            skipLog4j = true;
+        } catch (ClassNotFoundException e) {
+            skipLog4j = false;
+        }
+    }
 
     private Set<Skip> skip;
 
@@ -174,9 +184,10 @@ public class TempClassLoader extends URL
         if (name.startsWith("serp.bytecode")) return true;
         if (name.startsWith("org.apache.webbeans.")) return true;
 
-        if (name.startsWith("org.apache.log4j")) return true;
         if (name.startsWith("org.slf4j")) return true;
 
+        if (skipLog4j && name.startsWith("org.apache.log4j")) return true;
+
 //        if (name.startsWith("org.apache.myfaces.")) return true;
 //        if (name.startsWith("org.apache.taglibs.")) return true;
 //        if (name.startsWith("org.apache.tomcat.")) return true;