cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r966466 - /cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Date Thu, 22 Jul 2010 00:08:48 GMT
Author: bimargulies
Date: Thu Jul 22 00:08:47 2010
New Revision: 966466

URL: http://svn.apache.org/viewvc?rev=966466&view=rev
Log:
Fix unit test error when spring configs more than one handler for the jetty instance

Modified:
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=966466&r1=966465&r2=966466&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Thu Jul 22 00:08:47 2010
@@ -336,7 +336,9 @@ public class JettyHTTPServerEngine
                 &&
                 (existingHandler != null || numberOfHandlers > 1)) {
                 handlerCollection = new HandlerCollection();
-                handlerCollection.addHandler(existingHandler);
+                if (existingHandler != null) {
+                    handlerCollection.addHandler(existingHandler);
+                }
                 server.setHandler(handlerCollection);
             }
             



Mime
View raw message