Repository: tomee Updated Branches: refs/heads/master 4cf313cf4 -> a97281f96
limit the number of threads used to scan tld for openejb part if we dont scan more urls than processors Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a97281f9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a97281f9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a97281f9 Branch: refs/heads/master Commit: a97281f96ba9a8e4f29c6068f53ea459578819fb Parents: 4cf313c Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Wed Jun 17 07:20:52 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Wed Jun 17 07:20:52 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/TldScanner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/a97281f9/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 11da933..2d9a895 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 @@ -109,7 +109,9 @@ public class TldScanner { tldUrls.addAll(scan(classLoader.getParent())); if (urls.size() > 0) { - final ExecutorService es = Executors.newFixedThreadPool(2 * Runtime.getRuntime().availableProcessors() + 1, new DaemonThreadFactory("OpenEJB-tld-server-scanning")); + final ExecutorService es = Executors.newFixedThreadPool( + Math.min(urls.size(), 2 * Runtime.getRuntime().availableProcessors() + 1), + new DaemonThreadFactory("OpenEJB-tld-server-scanning")); final Collection<Future<Set<URL>>> futures = new ArrayList<Future<Set<URL>>>(urls.size()); for (URL url : urls) {
