[jboss-cvs] JBossAS SVN: r88341 - projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2009-05-07 04:37:48 -0400 (Thu, 07 May 2009)
New Revision: 88341

Modified:
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedVFSClassLoaderDomain.java
Log:
[JBAOP-729] Fix CCE

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedVFSClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedVFSClassLoaderDomain.java	2009-05-07 08:18:57 UTC (rev 88340)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/ScopedVFSClassLoaderDomain.java	2009-05-07 08:37:48 UTC (rev 88341)
@@ -631,8 +631,7 @@
       
       public LinkedHashMap<String, PrecedenceDef> getPrecedenceDefs()
       {
-         final Map<String, PrecedenceDef> empty = Collections.emptyMap();
-         Map<String, PrecedenceDef> result = empty;
+         LinkedHashMap<String, PrecedenceDef> result = UnmodifiableEmptyCollections.EMPTY_LINKED_HASHMAP;
          ReadWriteLock lock = lockReadSiblingDomains();
          try
          {
@@ -642,7 +641,7 @@
                {
                   if (aopDomain.precedenceDefs.size() > 0)
                   {
-                     if (result == empty)
+                     if (result == UnmodifiableEmptyCollections.EMPTY_LINKED_HASHMAP)
                      {
                         result = new LinkedHashMap<String, PrecedenceDef>();
                      }
@@ -656,7 +655,7 @@
          {
             unlockReadSiblingDomains(lock);
          }
-         return (LinkedHashMap<String, PrecedenceDef>)result;
+         return result;
       }
 
       public Object synchronizeClassMetaData()