[jboss-cvs] JBossAS SVN: r84096 - projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata.

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

Author: kabir.khan at jboss.com
Date: 2009-02-11 10:44:13 -0500 (Wed, 11 Feb 2009)
New Revision: 84096

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
Log:
[JBMICROCONT-407] Fix determining if there are some dependencies

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java	2009-02-11 15:33:45 UTC (rev 84095)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java	2009-02-11 15:44:13 UTC (rev 84096)
@@ -214,6 +214,11 @@
    
    private void getDependencies(ArrayList<ValueMetaData> dependencies, MetaDataVisitorNode node)
    {
+      if (node instanceof AbstractDependencyValueMetaData)
+      {
+         dependencies.add((AbstractDependencyValueMetaData)node);
+      }
+
       Iterator<? extends MetaDataVisitorNode> children = node.getChildren();
       
       if (children != null)
@@ -221,10 +226,6 @@
          while (children.hasNext())
          {
             MetaDataVisitorNode child = children.next();
-            if (child instanceof AbstractDependencyValueMetaData)
-            {
-               dependencies.add((AbstractDependencyValueMetaData)child);
-            }
             getDependencies(dependencies, child);
          }
       }