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 2015/03/02 14:33:52 UTC
tomee git commit: tccl is a good compromise for now
Repository: tomee
Updated Branches:
refs/heads/develop 0b35f4856 -> 7d90f0d3c
tccl is a good compromise for now
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7d90f0d3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7d90f0d3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7d90f0d3
Branch: refs/heads/develop
Commit: 7d90f0d3cd5a433843557d77dd1c041f9350ddab
Parents: 0b35f48
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Mar 2 14:33:44 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Mar 2 14:33:44 2015 +0100
----------------------------------------------------------------------
.../websocket/JavaEEDefaultServerEnpointConfigurator.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7d90f0d3/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/websocket/JavaEEDefaultServerEnpointConfigurator.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/websocket/JavaEEDefaultServerEnpointConfigurator.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/websocket/JavaEEDefaultServerEnpointConfigurator.java
index 264f2d4..34df1dc 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/websocket/JavaEEDefaultServerEnpointConfigurator.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/websocket/JavaEEDefaultServerEnpointConfigurator.java
@@ -35,6 +35,12 @@ public class JavaEEDefaultServerEnpointConfigurator extends DefaultServerEndpoin
final ClassLoader classLoader = clazz.getClassLoader();
InstanceManager instanceManager = instanceManagers.get(classLoader);
+ if (instanceManager == null) {
+ final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ if (tccl != null) {
+ instanceManager = instanceManagers.get(tccl);
+ }
+ }
// if we have a single app fallback otherwise we don't have enough contextual information here
if (instanceManager == null && instanceManagers.size() == 1) {
instanceManager = instanceManagers.values().iterator().next();