399568 - OSGi tests can't find websocket classes

+ Changing classloading in WebSocketServlet to be more OSGi friendly

1 files changed, 3 insertions, 1 deletions

diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
index 55380a9052..355accfbae 100644
--- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
@@ -126,8 +126,10 @@ public abstract class WebSocketServlet extends HttpServlet
             }
             else
             {
+                // Load the default class if ServiceLoader mechanism isn't valid in this environment. (such as OSGi)
+                ClassLoader loader = Thread.currentThread().getContextClassLoader();
                 @SuppressWarnings("unchecked")
-                Class<WebSocketServletFactory> wssf = (Class<WebSocketServletFactory>)getServletContext().getClass().getClassLoader()
+                Class<WebSocketServletFactory> wssf = (Class<WebSocketServletFactory>)loader
                         .loadClass("org.eclipse.jetty.websocket.server.WebSocketServerFactory");
                 baseFactory = wssf.newInstance();
             }