[jboss-cvs] JBossAS SVN: r93309 - projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-09 07:51:41 -0400 (Wed, 09 Sep 2009)
New Revision: 93309

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoadingSpace.java
Log:
[JBCL-24] Circular and self dependencies
Fix assumption that package is only exported by one module


Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoadingSpace.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoadingSpace.java	2009-09-09 10:32:15 UTC (rev 93308)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoadingSpace.java	2009-09-09 11:51:41 UTC (rev 93309)
@@ -298,9 +298,9 @@
       {
          for (String packageName : packageNames)
          {
-            Module removed = modulesByPackage.remove(packageName);
-            if (removed != module)
-               throw new IllegalStateException("BUG: Removed module " + removed + " for package " + packageName + " is not the expected module: " + module);
+            Module other = modulesByPackage.get(packageName);
+            if (other == module)
+               modulesByPackage.remove(packageName);
          }
       }