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/10/26 19:59:48 UTC
git commit: TOMEE-1428 skip TempClassLoader when not needed
Repository: tomee
Updated Branches:
refs/heads/develop bd7fd6809 -> fe8b087fd
TOMEE-1428 skip TempClassLoader when not needed
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fe8b087f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fe8b087f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fe8b087f
Branch: refs/heads/develop
Commit: fe8b087fd8d2740bbf066cb7ea1ef4fc803ccbe0
Parents: bd7fd68
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Oct 26 19:59:31 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Oct 26 19:59:31 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/config/AnnotationDeployer.java | 7 ++++++-
.../main/java/org/apache/openejb/core/TempClassLoader.java | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fe8b087f/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 677961a..cb03ded 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -25,6 +25,7 @@ import org.apache.openejb.api.RemoteClient;
import org.apache.openejb.cdi.CdiBeanInfo;
import org.apache.openejb.config.rules.CheckClasses;
import org.apache.openejb.core.EmptyResourcesClassLoader;
+import org.apache.openejb.core.TempClassLoader;
import org.apache.openejb.core.webservices.JaxWsUtils;
import org.apache.openejb.dyni.DynamicSubclass;
import org.apache.openejb.jee.ActivationConfig;
@@ -5508,7 +5509,11 @@ public class AnnotationDeployer implements DynamicDeployer {
final ClassLoader loader = clazz.getClassLoader();
final URL url;
if (loader != null) {
- url = loader.getResource(classFileName);
+ if (TempClassLoader.class.isInstance(loader)) {
+ url = TempClassLoader.class.cast(loader).getInternalResource(classFileName);
+ } else { // shouldn't occur
+ url = loader.getResource(classFileName);
+ }
} else {
url = clazz.getResource(classFileName);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fe8b087f/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
index 10b1ee1..921a0ca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
@@ -80,8 +80,7 @@ public class TempClassLoader extends URLClassLoader {
return this.loadClass(name, false);
}
- @Override
- public URL getResource(final String name) {
+ public URL getInternalResource(final String name) {
if (!name.startsWith("java/") && !name.startsWith("javax/") && name.endsWith(".class")) {
try {
final Enumeration<URL> resources = getResources(name);