Author: dkulp Date: Mon Jul 15 18:50:03 2013 New Revision: 1503410 URL: http://svn.apache.org/r1503410 Log: Merged revisions 1502502 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1502502 | ay | 2013-07-12 05:47:14 -0400 (Fri, 12 Jul 2013) | 17 lines 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.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Modified: cxf/branches/2.5.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.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=1503410&r1=1503409&r2=1503410&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Mon Jul 15 18:50:03 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); @@ -128,7 +130,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);
