Author: rmannibucau
Date: Wed Aug 1 15:21:19 2012
New Revision: 1368052
URL: http://svn.apache.org/viewvc?rev=1368052&view=rev
Log:
TOMEE-346 fixing log4j skip test
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=1368052&r1=1368051&r2=1368052&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
Wed Aug 1 15:21:19 2012
@@ -46,7 +46,7 @@ import java.util.Set;
// Note: this class is a fork from OpenJPA
public class TempClassLoader extends URLClassLoader {
// log4j is optional, moreover it will likely not work if not skipped and
loaded by a temp classloader
- private static final boolean SKIP_LOG4J =
"true".equals(SystemInstance.get().getProperty("openejb.skip.log4j", "true"))
|| skipLib("org.apache.log4j.Logger");
+ private static final boolean SKIP_LOG4J =
"true".equals(SystemInstance.get().getProperty("openejb.skip.log4j", "true"))
&& skipLib("org.apache.log4j.Logger");
// commons-net is only in tomee-plus
private static final boolean SKIP_COMMONS_NET =
skipLib("org.apache.commons.net.pop3.POP3Client");