cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6402] Anoter try at initializing contexts from the existing server
Date Mon, 18 May 2015 20:46:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 4e60f32c9 -> 222884237


[CXF-6402] Anoter try at initializing contexts from the existing server


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

Branch: refs/heads/master
Commit: 222884237c87e2873ced8be4f54366dcfe70fc7f
Parents: 4e60f32
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Mon May 18 21:46:33 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Mon May 18 21:46:33 2015 +0100

----------------------------------------------------------------------
 .../cxf/transport/http_jetty/JettyHTTPServerEngine.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/22288423/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 a6a78a2..d97fa3e 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
@@ -386,9 +386,10 @@ public class JettyHTTPServerEngine implements ServerEngine {
             checkRegistedContext(url);
         }
         if (contexts == null) {
-            contexts = new ContextHandlerCollection();
-            if (server != null) {
-                server.setHandler(contexts);
+            if (server != null && server.getHandler() instanceof ContextHandlerCollection)
{
+                contexts = (ContextHandlerCollection) server.getHandler();
+            } else {
+                contexts = new ContextHandlerCollection();    
             }
         }
         


Mime
View raw message