Repository: tomee Updated Branches: refs/heads/master e416ea933 -> f0d07432d
TOMEE-2028 openejb.taglib.scan flag Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f0d07432 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f0d07432 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f0d07432 Branch: refs/heads/master Commit: f0d07432d3062450033d398fa46dc475fb214d51 Parents: e416ea9 Author: rmannibucau <[email protected]> Authored: Fri Mar 17 22:20:11 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Fri Mar 17 22:20:11 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/TldScanner.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f0d07432/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java index e8849f3..31652ad 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java @@ -18,6 +18,7 @@ package org.apache.openejb.config; import org.apache.openejb.OpenEJBException; +import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.DaemonThreadFactory; import org.apache.openejb.util.URLs; import org.apache.xbean.finder.UrlSet; @@ -72,6 +73,10 @@ public class TldScanner { private static final Map<Integer, Set<URL>> cacheByhashCode = new WeakHashMap<Integer, Set<URL>>(); public static Set<URL> scan(final ClassLoader classLoader) throws OpenEJBException { + if (skip()) { + return Collections.emptySet(); + } + if (classLoader == null) { return Collections.emptySet(); } @@ -87,7 +92,14 @@ public class TldScanner { return result; } + private static boolean skip() { + return !"true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.taglib.scan", "true")); + } + public static Set<URL> scanClassLoaderForTagLibs(final ClassLoader classLoader) throws OpenEJBException { + if (skip()) { + return Collections.emptySet(); + } final Set<URL> tldUrls = new HashSet<URL>();
