tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: don't check classloader in JavaEEDefaultServerEnpointConfigurator, this brings more false negative than it fixes
Date Mon, 02 Mar 2015 13:26:49 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop f5435caa9 -> 0b35f4856


don't check classloader in JavaEEDefaultServerEnpointConfigurator, this brings more false
negative than it fixes


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0b35f485
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0b35f485
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0b35f485

Branch: refs/heads/develop
Commit: 0b35f485639e509baa010582b8eca16e6ebb6bf3
Parents: f5435ca
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Mon Mar 2 14:26:37 2015 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Mon Mar 2 14:26:37 2015 +0100

----------------------------------------------------------------------
 .../websocket/JavaEEDefaultServerEnpointConfigurator.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/0b35f485/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 c0049a0..264f2d4 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
@@ -34,7 +34,9 @@ public class JavaEEDefaultServerEnpointConfigurator extends DefaultServerEndpoin
     public <T> T getEndpointInstance(final Class<T> clazz) throws InstantiationException
{
         final ClassLoader classLoader = clazz.getClassLoader();
         InstanceManager instanceManager = instanceManagers.get(classLoader);
-        if (instanceManager == null && classLoader == ClassLoader.getSystemClassLoader()
&& instanceManagers.size() == 1) {
+
+        // 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();
         }
         if (instanceManager == null) {


Mime
View raw message