You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by az...@apache.org on 2012/02/23 06:09:36 UTC
svn commit: r1292648 - /axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java

Author: azeez
Date: Thu Feb 23 05:09:35 2012
New Revision: 1292648

URL: http://svn.apache.org/viewvc?rev=1292648&view=rev
Log:
Need to check whether the classloader of a particular service group or module is null before adding it to the ConcurrentHashMap to avoid an NPE

Modified:
    axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java

Modified: axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java?rev=1292648&r1=1292647&r2=1292648&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ClassLoaderUtil.java Thu Feb 23 05:09:35 2012
@@ -38,17 +38,25 @@ public class ClassLoaderUtil {
         classLoaders.put("axis2", ClassLoaderUtil.class.getClassLoader());
         for (Iterator iter = configuration.getServiceGroups(); iter.hasNext(); ) {
             AxisServiceGroup group = (AxisServiceGroup) iter.next();
-            classLoaders.put(getServiceGroupMapKey(group), group.getServiceGroupClassLoader());
+            ClassLoader serviceGroupClassLoader = group.getServiceGroupClassLoader();
+            if (serviceGroupClassLoader != null) {
+                classLoaders.put(getServiceGroupMapKey(group), serviceGroupClassLoader);
+            }
         }
         for (Object obj : configuration.getModules().values()) {
             AxisModule module = (AxisModule) obj;
-            classLoaders.put(getModuleMapKey(module), module.getModuleClassLoader());
+            ClassLoader moduleClassLoader = module.getModuleClassLoader();
+            if (moduleClassLoader != null) {
+                classLoaders.put(getModuleMapKey(module), moduleClassLoader);
+            }
         }
     }
 
     public static void addServiceGroupClassLoader(AxisServiceGroup serviceGroup) {
-        classLoaders.put(getServiceGroupMapKey(serviceGroup),
-                         serviceGroup.getServiceGroupClassLoader());
+        ClassLoader serviceGroupClassLoader = serviceGroup.getServiceGroupClassLoader();
+        if (serviceGroupClassLoader != null) {
+            classLoaders.put(getServiceGroupMapKey(serviceGroup), serviceGroupClassLoader);
+        }
     }
 
     public static void removeServiceGroupClassLoader(AxisServiceGroup serviceGroup) {
@@ -60,8 +68,10 @@ public class ClassLoaderUtil {
     }
 
     public static void addModuleClassLoader(AxisModule module) {
-        classLoaders.put(getModuleMapKey(module),
-                         module.getModuleClassLoader());
+        ClassLoader moduleClassLoader = module.getModuleClassLoader();
+        if (moduleClassLoader != null) {
+            classLoaders.put(getModuleMapKey(module), moduleClassLoader);
+        }
     }
 
     public static void removeModuleClassLoader(AxisModule axisModule) {