You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/10/08 20:34:47 UTC
svn commit: r1530380 -
/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
Author: dkulp
Date: Tue Oct 8 18:34:46 2013
New Revision: 1530380
URL: http://svn.apache.org/r1530380
Log:
Merged revisions 1530339 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1530339 | dkulp | 2013-10-08 12:26:55 -0400 (Tue, 08 Oct 2013) | 2 lines
In some cases, setting the context of the bus could cause another listener to ask for the bus causeing a second bus to be created. Make sure the current one is registered BEFORE calling the setContext
........
Modified:
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java?rev=1530380&r1=1530379&r2=1530380&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java Tue Oct 8 18:34:46 2013
@@ -70,9 +70,9 @@ public class BusWiringBeanFactoryPostPro
boolean create) {
if (!context.containsBean(name) && (create || Bus.DEFAULT_BUS_ID.equals(name))) {
SpringBus b = new SpringBus();
- b.setApplicationContext(context);
ConfigurableApplicationContext cctx = (ConfigurableApplicationContext)context;
cctx.getBeanFactory().registerSingleton(name, b);
+ b.setApplicationContext(context);
}
return (Bus)context.getBean(name, Bus.class);
}