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

[nthaker]

Author: nthaker
Date: Sun Aug  8 18:34:43 2010
New Revision: 983468

URL: http://svn.apache.org/viewvc?rev=983468&view=rev
Log:
Axis2-4793
Fix for NPE When invoking Shutdown Modules in ConfigurationContext.

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=983468&r1=983467&r2=983468&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
 Sun Aug  8 18:34:43 2010
@@ -741,14 +741,16 @@ public class ConfigurationContext extend
         if(log.isDebugEnabled()){
             log.debug("Invoke modules shutdown.");
         }
-        HashMap modules = axisConfiguration.getModules();
-        if (modules != null) {
-            Iterator moduleitr = modules.values().iterator();
-            while (moduleitr.hasNext()) {
-                AxisModule axisModule = (AxisModule) moduleitr.next();
-                Module module = axisModule.getModule();
-                if (module != null) {
-                    module.shutdown(this);
+        if(axisConfiguration!=null){
+            HashMap modules = axisConfiguration.getModules();
+            if (modules != null) {
+                Iterator moduleitr = modules.values().iterator();
+                while (moduleitr.hasNext()) {
+                    AxisModule axisModule = (AxisModule) moduleitr.next();
+                    Module module = axisModule.getModule();
+                    if (module != null) {
+                        module.shutdown(this);
+                    }
                 }
             }
         }
@@ -757,12 +759,14 @@ public class ConfigurationContext extend
         if(log.isDebugEnabled()){
             log.debug("Invoke services shutdown.");
         }
-        for (Iterator services = 
axisConfiguration.getServices().values().iterator();
-        services.hasNext();) {
-            AxisService axisService = (AxisService) services.next();
-            ServiceLifeCycle serviceLifeCycle = 
axisService.getServiceLifeCycle();
-            if (serviceLifeCycle != null) {
-                serviceLifeCycle.shutDown(this, axisService);
+        if(axisConfiguration!=null){
+            for (Iterator services = 
axisConfiguration.getServices().values().iterator();
+            services.hasNext();) {
+                AxisService axisService = (AxisService) services.next();
+                ServiceLifeCycle serviceLifeCycle = 
axisService.getServiceLifeCycle();
+                if (serviceLifeCycle != null) {
+                    serviceLifeCycle.shutDown(this, axisService);
+                }
             }
         }
         stopped = true;