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 2016/06/06 06:01:17 UTC
tomee git commit: TOMEE-1829 ensure com.sun.mail can be loaded from
webapps and excluding jdk package from webapp loading
Repository: tomee
Updated Branches:
refs/heads/master 34dd01a87 -> 0492bf1ed
TOMEE-1829 ensure com.sun.mail can be loaded from webapps and excluding jdk package from webapp loading
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0492bf1e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0492bf1e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0492bf1e
Branch: refs/heads/master
Commit: 0492bf1ed338fe7f19ae2d15198475dc6d28f3cc
Parents: 34dd01a
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Jun 6 08:01:04 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Jun 6 08:01:04 2016 +0200
----------------------------------------------------------------------
.../openejb/persistence/PersistenceUnitInfoImpl.java | 3 +++
.../openejb/util/classloader/URLClassLoaderFirst.java | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0492bf1e/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index ad7b48e..3389b5f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -561,6 +561,9 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
if (name.startsWith("com.sun.")) {
return true;
}
+ if (name.startsWith("jdk.")) {
+ return true;
+ }
if (name.startsWith("javassist")) {
return true;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0492bf1e/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
----------------------------------------------------------------------
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 81c1ba9..131f5df 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
@@ -483,8 +483,18 @@ public class URLClassLoaderFirst extends URLClassLoader {
// other packages
if (name.startsWith("com.sun.")) {
- return isInJvm(name);
+ final String sub = name.substring("com.".length());
+ if (sub.startsWith("sun.")) {
+ return !name.startsWith("sun.mail.") && isInJvm(name);
+ }
+ if (sub.startsWith("oracle.")) {
+ return true;
+ }
}
+ if (name.startsWith("jdk.")) {
+ return true;
+ }
+
if (name.startsWith("serp.bytecode.")) {
return true;
}