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] One more update
Date Tue, 19 May 2015 11:18:08 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 06a72bcaf -> 5c919818b


[CXF-6402] One more update


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

Branch: refs/heads/3.0.x-fixes
Commit: 5c919818b97c5194e161dbfbe551a153a2a856dd
Parents: 06a72bc
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue May 19 12:16:20 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue May 19 12:17:48 2015 +0100

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


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


Mime
View raw message