svn commit: r993410 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java

[ba...@apache.org]

Author: barrettj
Date: Tue Sep  7 16:07:16 2010
New Revision: 993410

URL: http://svn.apache.org/viewvc?rev=993410&view=rev
Log:
Always shudown modules in the terminate method.  Added logs to indicate what will be shutdown.

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=993410&r1=993409&r2=993410&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Tue Sep  7 16:07:16 2010
@@ -735,6 +735,9 @@ public class ConfigurationContext extend
      */
     public void shutdownModulesAndServices() throws AxisFault{
         if(stopped){
+            if (log.isDebugEnabled()) {
+                log.debug("ConfigurationContext is stopped, modules and services not being shut down");
+            }
             return;
         }
         /*Shut down the modules*/
@@ -743,6 +746,9 @@ public class ConfigurationContext extend
         }
         if(axisConfiguration!=null){
             HashMap modules = axisConfiguration.getModules();
+            if (log.isDebugEnabled()) {
+                log.debug("Modules to be shutdown from axisConfiguration: " + modules);
+            }
             if (modules != null) {
                 Iterator moduleitr = modules.values().iterator();
                 while (moduleitr.hasNext()) {
@@ -777,16 +783,9 @@ public class ConfigurationContext extend
      * @throws AxisFault
      */
     public void terminate() throws AxisFault {
+        shutdownModulesAndServices();
         if (listenerManager != null) {
             listenerManager.destroy();
-        } else {
-            if(log.isDebugEnabled()){
-                log.debug("Start Invoke modules and services shutdown.");
-            }
-            shutdownModulesAndServices();
-            if(log.isDebugEnabled()){
-                log.debug("End Invoke modules and services shutdown.");
-            }
         }
         if (axisConfiguration != null) {
             axisConfiguration.cleanup();