cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject cxf git commit: revert part of CXF-6314 for the build issue
Date Tue, 24 Mar 2015 16:28:24 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 6d637dcb2 -> 4534b2955


revert part of CXF-6314 for the build issue


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4534b295
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4534b295
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4534b295

Branch: refs/heads/master
Commit: 4534b29556a1da628c920c36e4245d0d35ca6905
Parents: 6d637dc
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Tue Mar 24 17:28:13 2015 +0100
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Tue Mar 24 17:28:13 2015 +0100

----------------------------------------------------------------------
 .../websocket/jetty9/Jetty9WebSocketDestination.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4534b295/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
index e4677c4..af16b9f 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.http.DestinationRegistry;
@@ -54,7 +55,6 @@ import org.apache.cxf.workqueue.WorkQueueManager;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketAdapter;
-import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
 import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
@@ -77,7 +77,13 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination implements
     public Jetty9WebSocketDestination(Bus bus, DestinationRegistry registry, EndpointInfo
ei,
                                      JettyHTTPServerEngineFactory serverEngineFactory) throws
IOException {
         super(bus, registry, ei, serverEngineFactory);
-        webSocketFactory = new WebSocketServerFactory();
+        try {
+            webSocketFactory = (WebSocketServletFactory)ClassLoaderUtils
+                .loadClass("org.eclipse.jetty.websocket.server.WebSocketServerFactory",
+                           WebSocketServletFactory.class).newInstance();
+        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException
e) {
+            throw new RuntimeException(e);
+        }
         webSocketFactory.setCreator(new Creator());
         executor = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
     }


Mime
View raw message