[Jboss-cvs] JBossAS SVN: r56878 - branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-09-14 20:39:28 -0400 (Thu, 14 Sep 2006)
New Revision: 56878

Modified:
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java
Log:
Check the pkgNames list for null before using it in the for loop

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java	2006-09-15 00:38:27 UTC (rev 56877)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java	2006-09-15 00:39:28 UTC (rev 56878)
@@ -894,15 +894,18 @@
          if (dynamic == false)
          {
             List<String> pkgNames = loaderToPackagesMap.remove(cl);
-            for(String pkgName : pkgNames)
+            if( pkgNames != null )
             {
-               Set pkgSet = (Set) packagesMap.get(pkgName);
-               if (pkgSet != null)
+               for(String pkgName : pkgNames)
                {
-                  pkgSet.remove(cl);
-                  if (pkgSet.isEmpty())
-                     packagesMap.remove(pkgName);
-               }               
+                  Set pkgSet = (Set) packagesMap.get(pkgName);
+                  if (pkgSet != null)
+                  {
+                     pkgSet.remove(cl);
+                     if (pkgSet.isEmpty())
+                        packagesMap.remove(pkgName);
+                  }               
+               }
             }
          }
          else

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java	2006-09-15 00:38:27 UTC (rev 56877)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepositoryDCL.java	2006-09-15 00:39:28 UTC (rev 56878)
@@ -830,15 +830,18 @@
          if (dynamic == false)
          {
             List<String> pkgNames = loaderToPackagesMap.remove(cl);
-            for(String pkgName : pkgNames)
+            if( pkgNames != null )
             {
-               Set pkgSet = (Set) packagesMap.get(pkgName);
-               if (pkgSet != null)
+               for(String pkgName : pkgNames)
                {
-                  pkgSet.remove(cl);
-                  if (pkgSet.isEmpty())
-                     packagesMap.remove(pkgName);
-               }               
+                  Set pkgSet = (Set) packagesMap.get(pkgName);
+                  if (pkgSet != null)
+                  {
+                     pkgSet.remove(cl);
+                     if (pkgSet.isEmpty())
+                        packagesMap.remove(pkgName);
+                  }               
+               }
             }
          }
          else