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:49:44 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9d288b141 -> d5dbdc97b


[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/d5dbdc97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d5dbdc97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d5dbdc97

Branch: refs/heads/2.7.x-fixes
Commit: d5dbdc97b847ca2c64f49976439e5766b5ccf0cb
Parents: 9d288b1
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:49:26 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/d5dbdc97/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 e862ac2..b7e5e01 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
@@ -317,9 +317,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