svn commit: r959581 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: context/ConfigurationContext.java engine/AxisConfiguration.java

[azeez]

Author: azeez
Date: Thu Jul  1 10:00:47 2010
New Revision: 959581

URL: http://svn.apache.org/viewvc?rev=959581&view=rev
Log:
Few more cleanup related stuff


Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.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=959581&r1=959580&r2=959581&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
 Thu Jul  1 10:00:47 2010
@@ -775,7 +775,7 @@ public class ConfigurationContext extend
     public void terminate() throws AxisFault {
         if (listenerManager != null) {
             listenerManager.destroy();
-        }else{
+        } else {
             if(log.isDebugEnabled()){
                 log.debug("Start Invoke modules and services shutdown.");
             }
@@ -784,9 +784,11 @@ public class ConfigurationContext extend
                 log.debug("End Invoke modules and services shutdown.");
             }
         }
-        axisConfiguration.cleanup();
-        cleanupTemp();
-        this.axisConfiguration = null;
+        if (axisConfiguration != null) {
+            axisConfiguration.cleanup();
+            cleanupTemp();
+            this.axisConfiguration = null;
+        }
     }
 
     /**

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=959581&r1=959580&r2=959581&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
 Thu Jul  1 10:00:47 2010
@@ -1408,6 +1408,9 @@ public class AxisConfiguration extends A
         if (configurator != null) {
             configurator.cleanup();
         }
+        if (clusteringAgent != null) {
+            clusteringAgent.finalize();
+        }
         this.policySupportedModules.clear();
         this.moduleConfigmap.clear();
         this.allEndpoints.clear();
@@ -1416,6 +1419,9 @@ public class AxisConfiguration extends A
         this.outPhases.clear();
         this.messageReceivers.clear();
         this.targetResolvers.clear();
+        if (this.engagedModules != null) {
+            this.engagedModules.clear();
+        }
         this.configurator = null;
     }