Author: ningjiang Date: Wed Dec 22 10:46:26 2010 New Revision: 1051820 URL: http://svn.apache.org/viewvc?rev=1051820&view=rev Log: Merged revisions 1051817 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1051817 | ningjiang | 2010-12-22 18:38:52 +0800 (Wed, 22 Dec 2010) | 9 lines Merged revisions 1051792 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1051792 | ningjiang | 2010-12-22 16:45:42 +0800 (Wed, 22 Dec 2010) | 1 line CXF-3213 BusApplicationListener should listen to the events of the BusApplicationContext parent ........ ................ Added: cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java - copied unchanged from r1051817, cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 22 10:46:26 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809 -/cxf/trunk:1041183,1044238-1044305,1049426,1051790 +/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817 +/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java?rev=1051820&r1=1051819&r2=1051820&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java Wed Dec 22 10:46:26 2010 @@ -47,6 +47,7 @@ public class BusApplicationListener impl while (ac != null && !doIt) { if (event.getSource() == ac) { doIt = true; + break; } ac = ac.getParent(); } @@ -72,6 +73,13 @@ public class BusApplicationListener impl if (applicationContext instanceof AbstractApplicationContext) { ctx = (AbstractApplicationContext)applicationContext; ctx.addApplicationListener(this); + ApplicationContext ac = applicationContext.getParent(); + while (ac != null) { + if (ac instanceof AbstractApplicationContext) { + ((AbstractApplicationContext)ac).addApplicationListener(this); + } + ac = ac.getParent(); + } } }
