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/11/08 00:28:53 UTC
svn commit: r1406864 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/core/
container/openejb-core/src/main/java/org/apache/openejb/util/classloader/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
Author: rmannibucau
Date: Wed Nov 7 23:28:53 2012
New Revision: 1406864
URL: http://svn.apache.org/viewvc?rev=1406864&view=rev
Log:
simplifying usage of URLClassLoaderFirst.filterResources(
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.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=1406864&r1=1406863&r2=1406864&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 Nov 7 23:28:53 2012
@@ -70,11 +70,7 @@ public class TempClassLoader extends URL
@Override
public Enumeration<URL> getResources(final String name) throws IOException {
- final Enumeration<URL> urls = super.getResources(name);
- if (URLClassLoaderFirst.isFilterableResource(name)) {
- return URLClassLoaderFirst.filterResources(name, urls);
- }
- return urls;
+ return URLClassLoaderFirst.filterResources(name, super.getResources(name));
}
protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java?rev=1406864&r1=1406863&r2=1406864&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java Wed Nov 7 23:28:53 2012
@@ -326,11 +326,7 @@ public class URLClassLoaderFirst extends
@Override
public Enumeration<URL> getResources(final String name) throws IOException {
- final Enumeration<URL> result = super.getResources(name);
- if (URLClassLoaderFirst.isFilterableResource(name)) {
- return URLClassLoaderFirst.filterResources(name, result);
- }
- return result;
+ return URLClassLoaderFirst.filterResources(name, super.getResources(name));
}
public static boolean isFilterableResource(final String name) {
@@ -341,14 +337,17 @@ public class URLClassLoaderFirst extends
// useful method for SPI
public static Enumeration<URL> filterResources(final String name, final Enumeration<URL> result) {
- final Collection<URL> values = Collections.list(result);
- if (values.size() > 1) {
- // remove openejb one
- final URL url = URLClassLoaderFirst.class.getResource("/" + name);
- if (url != null) {
- values.remove(url);
+ if (isFilterableResource(name)) {
+ final Collection<URL> values = Collections.list(result);
+ if (values.size() > 1) {
+ // remove openejb one
+ final URL url = URLClassLoaderFirst.class.getResource("/" + name);
+ if (url != null) {
+ values.remove(url);
+ }
}
+ return Collections.enumeration(values);
}
- return Collections.enumeration(values);
+ return result;
}
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1406864&r1=1406863&r2=1406864&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Wed Nov 7 23:28:53 2012
@@ -165,11 +165,7 @@ public class LazyStopWebappClassLoader e
@Override
public Enumeration<URL> getResources(final String name) throws IOException {
- final Enumeration<URL> urls = super.getResources(name);
- if (URLClassLoaderFirst.isFilterableResource(name)) {
- return URLClassLoaderFirst.filterResources(name, urls);
- }
- return urls;
+ return URLClassLoaderFirst.filterResources(name, super.getResources(name));
}
@Override