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/08/06 07:39:51 UTC
svn commit: r1616099 - in /tomee/tomee/trunk:
arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
Author: rmannibucau
Date: Wed Aug 6 05:39:50 2014
New Revision: 1616099
URL: http://svn.apache.org/r1616099
Log:
keep old good embedded behavior
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml?rev=1616099&r1=1616098&r2=1616099&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml Wed Aug 6 05:39:50 2014
@@ -24,9 +24,6 @@
<configuration>
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
- <property name="properties">
- openejb.classloader.forced-skip=org.apache.openejb.arquillian.embedded.EmbeddedTomEEContainerTest,org.apache.openejb.arquillian.embedded.AnEJB
- </property>
</configuration>
</container>
</arquillian>
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java?rev=1616099&r1=1616098&r2=1616099&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java Wed Aug 6 05:39:50 2014
@@ -63,17 +63,16 @@ public class TomEEWebappClassLoader exte
private ClassLoaderConfigurer configurer;
private final int hashCode;
private Collection<File> additionalRepos;
- private volatile ClassLoader j2seClassLoader;
public TomEEWebappClassLoader() {
- j2seClassLoader = getSystemClassLoader();
hashCode = construct();
+ setJavaseClassLoader(getSystemClassLoader());
}
public TomEEWebappClassLoader(final ClassLoader parent) {
super(parent);
- j2seClassLoader = getSystemClassLoader();
hashCode = construct();
+ setJavaseClassLoader(getSystemClassLoader());
}
private int construct() {
@@ -104,14 +103,14 @@ public class TomEEWebappClassLoader exte
|| "org.apache.tomee.mojarra.TomEEInjectionProvider".equals(name)) {
// don't load them from system classloader (breaks all in embedded mode and no sense in other cases)
synchronized (this) {
- final ClassLoader old = j2seClassLoader;
- j2seClassLoader = NoClassClassLoader.INSTANCE;
+ final ClassLoader old = getJavaseClassLoader();
+ setJavaseClassLoader(NoClassClassLoader.INSTANCE);
final boolean delegate = getDelegate();
setDelegate(false);
try {
return super.loadClass(name);
} finally {
- j2seClassLoader = old;
+ setJavaseClassLoader(old);
setDelegate(delegate);
}
}