Fix build failure after merges from master
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d5b59474 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d5b59474 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d5b59474 Branch: refs/heads/3.1.x-fixes Commit: d5b5947492b738438fbc09f50d204cb6b755e07b Parents: c984c72 Author: Daniel Kulp <[email protected]> Authored: Tue Mar 7 15:02:42 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Mar 7 15:02:42 2017 -0500 ---------------------------------------------------------------------- .../transport/websocket/jetty9/Jetty9WebSocketDestination.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d5b59474/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 38006a7..8c3a4e8 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 @@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.jetty9; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.net.URL; import java.nio.ByteBuffer; import java.security.Principal; import java.util.Enumeration; @@ -83,9 +82,7 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination implements public Jetty9WebSocketDestination(Bus bus, DestinationRegistry registry, EndpointInfo ei, JettyHTTPServerEngineFactory serverEngineFactory) throws IOException { - super(bus, registry, ei, - serverEngineFactory == null ? null : new URL(getNonWSAddress(ei)), - serverEngineFactory); + super(bus, registry, ei, serverEngineFactory); executor = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue(); }
