Author: rmannibucau
Date: Wed May 22 16:39:42 2013
New Revision: 1485278
URL: http://svn.apache.org/r1485278
Log:
TOMEE-945 using new tomcat validate(name) method to check we should use or not
parent loader to find the class
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1485278&r1=1485277&r2=1485278&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
Wed May 22 16:39:42 2013
@@ -86,7 +86,7 @@ public class LazyStopWebappClassLoader e
}
// avoid to redefine classes from server in this classloader is it not
already loaded
- if (URLClassLoaderFirst.shouldSkip(name) ||
(name.startsWith("javax.faces.") && URLClassLoaderFirst.shouldSkipJsf(this,
name))) {
+ if (name.startsWith("javax.faces.") &&
URLClassLoaderFirst.shouldSkipJsf(this, name)) {
try {
return OpenEJB.class.getClassLoader().loadClass(name);
} catch (ClassNotFoundException e) {
@@ -98,6 +98,11 @@ public class LazyStopWebappClassLoader e
return super.loadClass(name);
}
+ @Override
+ protected boolean validate(final String name) {
+ return !URLClassLoaderFirst.shouldSkip(name);
+ }
+
public void internalStop() throws LifecycleException {
if (isStarted()) {
// reset classloader because of tomcat classloaderlogmanager
