From 222884237c87e2873ced8be4f54366dcfe70fc7f Mon Sep 17 00:00:00 2001
From: Sergey Beryozkin <sberyozkin@talend.com>
Date: Mon, 18 May 2015 21:46:33 +0100
Subject: [PATCH] [CXF-6402] Anoter try at initializing contexts from the
 existing server

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

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 a6a78a2c609..d97fa3eba10 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 synchronized void addServant(URL url, JettyHTTPHandler handler) {
             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();    
             }
         }