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

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

Author: alesj
Date: 2011-08-03 06:13:13 -0400 (Wed, 03 Aug 2011)
New Revision: 111909

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
Log:
[JBPAPP-6020]; keep nested beans, hence preserving order.


Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2011-08-03 02:04:28 UTC (rev 111908)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2011-08-03 10:13:13 UTC (rev 111909)
@@ -21,23 +21,6 @@
 */
 package org.jboss.beans.metadata.plugins;
 
-import static org.jboss.beans.metadata.plugins.CloneUtil.cloneList;
-import static org.jboss.beans.metadata.plugins.CloneUtil.cloneObject;
-import static org.jboss.beans.metadata.plugins.CloneUtil.cloneSet;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
 import org.jboss.beans.info.spi.BeanAccessMode;
 import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.spi.AliasMetaData;
@@ -70,6 +53,22 @@
 import org.jboss.util.JBossObject;
 import org.jboss.util.JBossStringBuilder;
 
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.jboss.beans.metadata.plugins.CloneUtil.cloneList;
+import static org.jboss.beans.metadata.plugins.CloneUtil.cloneObject;
+import static org.jboss.beans.metadata.plugins.CloneUtil.cloneSet;
+
 /**
  * Metadata for a bean.
  *
@@ -163,6 +162,9 @@
    /** The uninstall callback List<InstallMetaData> */
    protected List<CallbackMetaData> uninstallCallbacks;
 
+   /** The nested beans list */
+   protected transient List<BeanMetaData> beans;
+
    /** The context */
    protected transient ControllerContext context;
 
@@ -197,8 +199,12 @@
 
    public List<BeanMetaData> getBeans()
    {
-      NestedBeanHandler handler = createNestedBeanHandler();
-      return handler.checkForNestedBeans();
+      if (beans == null)
+      {
+         NestedBeanHandler handler = createNestedBeanHandler();
+         beans = handler.checkForNestedBeans();
+      }
+      return beans;
    }
 
    /**