[jbossws-commits] JBossWS SVN: r13030 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2010-09-27 07:51:10 -0400 (Mon, 27 Sep 2010)
New Revision: 13030

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-2987] Restoring a fixed check on bus holder listener before calling bus shutdown (JBWS-3098)


Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java	2010-09-27 08:46:22 UTC (rev 13029)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java	2010-09-27 11:51:10 UTC (rev 13030)
@@ -91,7 +91,11 @@
     */
    public void close()
    {
-      bus.shutdown(true);
+      //call bus shutdown unless the listener tells us shutdown has already been asked
+      if (busHolderListener == null || !busHolderListener.isPreShutdown())
+      {
+         bus.shutdown(true);
+      }
       busHolderListener = null;
    }