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 2017/03/29 17:07:59 UTC
tomee git commit: fixing taglib filtering after taglibs upgrade
Repository: tomee
Updated Branches:
refs/heads/master 63a72af0f -> c1b6380e9
fixing taglib filtering after taglibs upgrade
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c1b6380e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c1b6380e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c1b6380e
Branch: refs/heads/master
Commit: c1b6380e920e6e099c6622453befd7182ba9b504
Parents: 63a72af
Author: rmannibucau <rm...@apache.org>
Authored: Wed Mar 29 19:07:53 2017 +0200
Committer: rmannibucau <rm...@apache.org>
Committed: Wed Mar 29 19:07:53 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1b6380e/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index 6bc52a8..b3942a0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -840,7 +840,7 @@ public class ReadDescriptors implements DynamicDeployer {
public static TldTaglib readTldTaglib(final URL url) throws OpenEJBException {
// TOMEE-164 Optimization on reading built-in tld files
- if (url.getPath().contains("jstl-1.2.jar")) {
+ if (url.getPath().contains("jstl-1.2.jar") || (url.getPath().contains("taglibs-standard-") && url.getPath().contains(".jar!"))) {
return SKIP_TAGLIB;
}
if (url.getPath().contains("myfaces-impl")) { // we should return SKIP_TAGLIB too