Repository: cxf Updated Branches: refs/heads/master 793f0a7d2 -> ab1f363e1
[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/ab1f363e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ab1f363e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ab1f363e Branch: refs/heads/master Commit: ab1f363e1f1d41353949f8d4dee07bb827b551df Parents: 793f0a7 Author: Sergey Beryozkin <[email protected]> Authored: Mon May 18 17:39:24 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 18 17:39:24 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/ab1f363e/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 27d5145..a6a78a2 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 @@ -387,6 +387,9 @@ public class JettyHTTPServerEngine implements ServerEngine { } if (contexts == null) { contexts = new ContextHandlerCollection(); + if (server != null) { + server.setHandler(contexts); + } } SecurityHandler securityHandler = null;
