svn commit: r1037299 - /synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java

[hi...@apache.org]

Author: hiranya
Date: Sat Nov 20 18:59:53 2010
New Revision: 1037299

URL: http://svn.apache.org/viewvc?rev=1037299&view=rev
Log:
Fixing SYNAPSE-692. We should always disable the ListenerManager shutdown hook at Synapse level. Otherwise it clashes with the Synapse shutdown hook.


Modified:
    synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java

Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=1037299&r1=1037298&r2=1037299&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java Sat Nov 20 18:59:53 2010
@@ -580,12 +580,12 @@ public class Axis2SynapseController impl
                 // create and initialize the listener manager but do not start
                 listenerManager = new ListenerManager();
                 listenerManager.init(configurationContext);
-
-                // do not use the listener manager shutdown hook, because it clashes with the
-                // SynapseServer shutdown hook.
-                listenerManager.setShutdownHookRequired(false);
             }
             
+            // do not use the listener manager shutdown hook, because it clashes with the
+            // SynapseServer shutdown hook.
+            listenerManager.setShutdownHookRequired(false);
+
         } catch (Throwable t) {
             handleFatal("Failed to create a new Axis2 instance...", t);
         }