Author: ningjiang Date: Wed Dec 22 10:38:06 2010 New Revision: 1051816 URL: http://svn.apache.org/viewvc?rev=1051816&view=rev Log: Merged revisions 1051809 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1051809 | ningjiang | 2010-12-22 18:14:32 +0800 (Wed, 22 Dec 2010) | 9 lines Merged revisions 1051790 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1051790 | ningjiang | 2010-12-22 16:34:08 +0800 (Wed, 22 Dec 2010) | 1 line CXF-3214 Fix the BusLifeCycleListener preshutdown is called twice issue ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 22 10:38:06 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1041185,1044309,1051780 -/cxf/trunk:1041183,1044238-1044305,1049426 +/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809 +/cxf/trunk:1041183,1044238-1044305,1049426,1051790 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/buslifecycle/CXFBusLifeCycleManager.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java?rev=1051816&r1=1051815&r2=1051816&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java Wed Dec 22 10:38:06 2010 @@ -77,9 +77,11 @@ public class CXFBusLifeCycleManager impl public void preShutdown() { // TODO inverse order of registration? - preShutdownCalled = true; - for (BusLifeCycleListener listener : listeners) { - listener.preShutdown(); + if (!preShutdownCalled) { + preShutdownCalled = true; + for (BusLifeCycleListener listener : listeners) { + listener.preShutdown(); + } } }
