Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 56521ba53 -> 4e7d0b8de
[CXf-6402] Registering contexts as a handler if the server is not null Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e7d0b8d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e7d0b8d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e7d0b8d Branch: refs/heads/2.7.x-fixes Commit: 4e7d0b8dea372a596514d47f7bd1fdfa1f5d39ef Parents: 56521ba Author: Sergey Beryozkin <[email protected]> Authored: Mon May 18 17:39:24 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 18 17:41:20 2015 +0100 ---------------------------------------------------------------------- .../apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4e7d0b8d/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java index f926889..e862ac2 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java @@ -318,6 +318,9 @@ public class JettyHTTPServerEngine implements ServerEngine { } if (contexts == null) { contexts = new ContextHandlerCollection(); + if (server != null) { + server.setHandler(contexts); + } } SecurityHandler securityHandler = null;
