svn commit: r1051809 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java

[ningjiang]

Author: ningjiang
Date: Wed Dec 22 10:14:32 2010
New Revision: 1051809

URL: http://svn.apache.org/viewvc?rev=1051809&view=rev
Log:
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.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 22 10:14:32 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
+/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

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/buslifecycle/CXFBusLifeCycleManager.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java?rev=1051809&r1=1051808&r2=1051809&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
 Wed Dec 22 10:14:32 2010
@@ -78,9 +78,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();
+            }
         }
     }