[jboss-cvs] JBossAS SVN: r64138 - projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins.

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

Author: alesj
Date: 2007-07-19 10:20:03 -0400 (Thu, 19 Jul 2007)
New Revision: 64138

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
Log:
Check for null on aliases.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java	2007-07-19 14:07:53 UTC (rev 64137)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java	2007-07-19 14:20:03 UTC (rev 64138)
@@ -218,7 +218,8 @@
 
       public Set<Object> internalExecute(ControllerContext context)
       {
-         return Collections.unmodifiableSet(context.getAliases());
+         Set<Object> aliases = context.getAliases();
+         return aliases != null ? Collections.unmodifiableSet(aliases) : null;
       }
    }