Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 9a81d7e71 -> a9c4ec363
[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/a9c4ec36 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a9c4ec36 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a9c4ec36 Branch: refs/heads/3.0.x-fixes Commit: a9c4ec363eb0056b24a994682716ec0c45585099 Parents: 9a81d7e Author: Sergey Beryozkin <[email protected]> Authored: Mon May 18 17:39:24 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 18 17:40:27 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/a9c4ec36/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 531c43a..5920233 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 @@ -321,6 +321,9 @@ public class JettyHTTPServerEngine implements ServerEngine { } if (contexts == null) { contexts = new ContextHandlerCollection(); + if (server != null) { + server.setHandler(contexts); + } } SecurityHandler securityHandler = null;
