cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1502502 - in /cxf/branches/2.6.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
Date Fri, 12 Jul 2013 09:47:14 GMT
Author: ay
Date: Fri Jul 12 09:47:14 2013
New Revision: 1502502

URL: http://svn.apache.org/r1502502
Log:
Merged revisions 1502498 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1502498 | ay | 2013-07-12 11:42:22 +0200 (Fri, 12 Jul 2013) | 9 lines
  
  Merged revisions 1502490 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1502490 | ay | 2013-07-12 11:25:13 +0200 (Fri, 12 Jul 2013) | 1 line
    
    [CXF-5119] jetty endpoint may log exception when it is assigned to a non-default cxf bus
bus in spring beans
  ........
  
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=1502502&r1=1502501&r2=1502502&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
Fri Jul 12 09:47:14 2013
@@ -34,6 +34,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 import org.apache.cxf.management.InstrumentationManager;
@@ -46,6 +47,7 @@ import org.eclipse.jetty.util.component.
  * caches the JettyHTTPServerEngines so that they may be 
  * retrieved if already previously configured.
  */
+@NoJSR250Annotations(unlessNull = "bus")
 public class JettyHTTPServerEngineFactory {
     private static final Logger LOG =
         LogUtils.getL7dLogger(JettyHTTPServerEngineFactory.class);    
@@ -131,7 +133,6 @@ public class JettyHTTPServerEngineFactor
      */
     @Resource(name = "cxf")
     public final void setBus(Bus bus) {
-        assert this.bus == null || this.bus == bus;
         this.bus = bus;
         if (bus != null) {
             bus.setExtension(this, JettyHTTPServerEngineFactory.class);



Mime
View raw message