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/03/25 14:33:24 UTC
tomee git commit: ...was late yeysterday,
better workaround for tomcat 8.5.0 classloader bug
Repository: tomee
Updated Branches:
refs/heads/master 8bf647fb9 -> e8a923313
...was late yeysterday, better workaround for tomcat 8.5.0 classloader bug
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e8a92331
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e8a92331
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e8a92331
Branch: refs/heads/master
Commit: e8a9233137407eb964c02b1884fea8a57582e46c
Parents: 8bf647f
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Mar 25 14:33:03 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Mar 25 14:33:03 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomEEWebappClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e8a92331/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
index f97f295..b606e8d 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
@@ -414,7 +414,7 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader {
return super.getResourceAsStream(name);
} catch (final NullPointerException npe) {
// workaround cause of a bug in tomcat 8.5.0
- final URL url = super.findResource(name);
+ final URL url = super.getResource(name);
if (url != null) {
try {
return url.openStream();