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

jboss · May 18, 2015 · 2228842 · 2228842
1 parent 4e60f32
commit 2228842
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...s/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/...s/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();    
             }
         }