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/02/22 19:28:11 UTC
tomee git commit: surely to enhance later but when we don't find an
instance manager for a web socket class and we have a single app then use it
as fallback
Repository: tomee
Updated Branches:
refs/heads/develop f89c1a424 -> c1d8d4364
surely to enhance later but when we don't find an instance manager for a web socket class and we have a single app then use it as fallback
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c1d8d436
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c1d8d436
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c1d8d436
Branch: refs/heads/develop
Commit: c1d8d4364dfc924a3f6eec6270f3abe585459246
Parents: f89c1a4
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Feb 22 19:27:58 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Feb 22 19:27:58 2015 +0100
----------------------------------------------------------------------
.../websocket/JavaEEDefaultServerEnpointConfigurator.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1d8d436/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 e908ec7..c0049a0 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
@@ -32,7 +32,11 @@ public class JavaEEDefaultServerEnpointConfigurator extends DefaultServerEndpoin
@Override
public <T> T getEndpointInstance(final Class<T> clazz) throws InstantiationException {
- final InstanceManager instanceManager = instanceManagers.get(clazz.getClassLoader());
+ final ClassLoader classLoader = clazz.getClassLoader();
+ InstanceManager instanceManager = instanceManagers.get(classLoader);
+ if (instanceManager == null && classLoader == ClassLoader.getSystemClassLoader() && instanceManagers.size() == 1) {
+ instanceManager = instanceManagers.values().iterator().next();
+ }
if (instanceManager == null) {
return super.getEndpointInstance(clazz);
}