svn commit: r1051817 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java

[ningjiang]

Author: ningjiang
Date: Wed Dec 22 10:38:52 2010
New Revision: 1051817

URL: http://svn.apache.org/viewvc?rev=1051817&view=rev
Log:
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.3.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
      - copied unchanged from r1051792, 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 22 10:38:52 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792

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

Modified: 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java?rev=1051817&r1=1051816&r2=1051817&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java
 Wed Dec 22 10:38:52 2010
@@ -49,6 +49,7 @@ public class BusApplicationListener impl
         while (ac != null && !doIt) {
             if (event.getSource() == ac) {
                 doIt = true;
+                break;
             }
             ac = ac.getParent();
         }
@@ -74,6 +75,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();
+            }
         }        
     }