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:16:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 894eef1d1 -> ab687c5ce


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

Branch: refs/heads/master
Commit: ab687c5cecdb786764de4eb45868d1ff8b30835e
Parents: 894eef1
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:16:20 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/ab687c5c/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 d97fa3e..5d518c7 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,10 +386,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