Author: dkulp Date: Fri Jan 27 00:54:38 2012 New Revision: 1236475 URL: http://svn.apache.org/viewvc?rev=1236475&view=rev Log: Merged revisions 1236453 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1236453 | dkulp | 2012-01-26 19:01:26 -0500 (Thu, 26 Jan 2012) | 10 lines Merged revisions 1236452 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236452 | dkulp | 2012-01-26 18:57:42 -0500 (Thu, 26 Jan 2012) | 2 lines [CXF-4066] Makesure subclasses of AbstractTransportFactory don't register until local fields are ready. ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java cxf/branches/2.4.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1236475&r1=1236474&r2=1236475&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Fri Jan 27 00:54:38 2012 @@ -90,7 +90,7 @@ public class HTTPTransportFactory this(b, null); } public HTTPTransportFactory(Bus b, DestinationRegistry registry) { - super(DEFAULT_NAMESPACES, b); + super(DEFAULT_NAMESPACES, null); if (registry == null && b != null) { registry = b.getExtension(DestinationRegistry.class); } @@ -98,6 +98,8 @@ public class HTTPTransportFactory registry = new DestinationRegistryImpl(); } this.registry = registry; + bus = b; + register(); } public HTTPTransportFactory(DestinationRegistry registry) { Modified: cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java?rev=1236475&r1=1236474&r2=1236475&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java Fri Jan 27 00:54:38 2012 @@ -58,6 +58,9 @@ public class JMSTransportFactory extends public JMSTransportFactory() { super(DEFAULT_NAMESPACES); } + public JMSTransportFactory(Bus b) { + super(DEFAULT_NAMESPACES, b); + } @Resource(name = "cxf") public void setBus(Bus bus) { Modified: cxf/branches/2.4.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=1236475&r1=1236474&r2=1236475&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Fri Jan 27 00:54:38 2012 @@ -83,7 +83,7 @@ public class LocalTransportFactory exten this(null); } public LocalTransportFactory(Bus b) { - super(DEFAULT_NAMESPACES, b); + super(DEFAULT_NAMESPACES, null); messageFilterProperties = new HashSet<String>(); messageIncludeProperties = new HashSet<String>(); @@ -94,6 +94,9 @@ public class LocalTransportFactory exten messageIncludeProperties.add(Message.CONTENT_TYPE); messageIncludeProperties.add(Message.ACCEPT_CONTENT_TYPE); messageIncludeProperties.add(Message.RESPONSE_CODE); + + bus = b; + register(); } @Resource(name = "cxf")
