You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2020/06/05 19:24:36 UTC
[tomee] branch master updated: Recognize jakarta classes when
classloading
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 59e6078 Recognize jakarta classes when classloading
59e6078 is described below
commit 59e607847cf04bef51849e04e790e0859779ae33
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Jun 5 20:24:06 2020 +0100
Recognize jakarta classes when classloading
---
.../src/main/java/org/apache/openejb/core/TempClassLoader.java | 2 +-
.../java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 2cf387e..266b6ef 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
@@ -94,7 +94,7 @@ public class TempClassLoader extends URLClassLoader {
}
public URL getInternalResource(final String name) {
- if (!name.startsWith("java/") && !name.startsWith("javax/") && name.endsWith(".class")) {
+ if (!name.startsWith("java/") && !name.startsWith("javax/") && !name.startsWith("jakarta/") && name.endsWith(".class")) {
try {
final Enumeration<URL> resources = getResources(name);
if (!resources.hasMoreElements()) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
index d749584..b13d3d9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
@@ -229,7 +229,7 @@ public class URLClassLoaderFirst extends URLClassLoader {
if (name.startsWith("javax.mail.")) {
return false;
}
- if (name.startsWith("javax.")) {
+ if (name.startsWith("javax.") || name.startsWith("jakarta.\")) {
return isInServer(name);
}
if (name.startsWith("sun.")) {