From 936fd09a184338f46bcae6cf1c714a526566f618 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 5 Dec 2016 09:42:44 +1100
Subject: [PATCH] Issue  #1124

Fix classloading of WebSocketServerFactory for osgi.
---
 .../jetty/websocket/servlet/WebSocketServletFactory.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
index 72c14782346..93d8377ef7b 100644
--- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
@@ -44,7 +44,7 @@ public interface WebSocketServletFactory
             try
             {
                 Class<? extends WebSocketServletFactory> wsClazz =
-                        (Class<? extends WebSocketServletFactory>) Class.forName(DEFAULT_IMPL);
+                        (Class<? extends WebSocketServletFactory>) Class.forName(DEFAULT_IMPL,true,Thread.currentThread().getContextClassLoader());
                 Constructor<? extends WebSocketServletFactory> ctor = wsClazz.getDeclaredConstructor(new Class<?>[]{ServletContext.class, WebSocketPolicy.class});
                 return ctor.newInstance(ctx, policy);
             }