[jboss-cvs] JBossAS SVN: r114588 - in projects/microcontainer/branches/Branch_2_0: dependency/src/main/java/org/jboss/dependency/plugins/graph and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Dec 13 07:44:12 EST 2013 

Author: istudens at redhat.com
Date: 2013-12-13 07:44:11 -0500 (Fri, 13 Dec 2013)
New Revision: 114588

Modified:
   projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java
   projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeyLookupStrategy.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/spi/factory/PropertyMap.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/config/support/SimpleAnnotationImpl.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean2.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/support/GetInstanceBean.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/BeanFactoryContextualInjectionTestCase.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/GetInstanceTestCase.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/NullifyTestCase.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/BeanFactoryContextualInjectionTestCase.xml
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/GetInstanceTestCase.xml
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/NullifyTestCase.xml
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/xml/test/DemandWithTargetState.xml
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/xml/test/InjectionWithSearch.xml
Log:
JBPAPP-6020 - reverting back r111911 as 6020 is still open, but a new tag for EAP5.3 is needed, feel free to get it back once the tag is created


Property changes on: projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeyLookupStrategy.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2013-12-12 13:35:26 UTC (rev 114587)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2013-12-13 12:44:11 UTC (rev 114588)
@@ -162,9 +162,6 @@
    /** 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,15 +194,11 @@
       this.bean = bean;
    }
 
-    public List<BeanMetaData> getBeans()
-    {
-       if (beans == null)
-       {
-          NestedBeanHandler handler = createNestedBeanHandler();
-          beans = handler.checkForNestedBeans();
-       }
-       return beans;
-    }
+   public List<BeanMetaData> getBeans()
+   {
+      NestedBeanHandler handler = createNestedBeanHandler();
+      return handler.checkForNestedBeans();
+   }
 
    /**
     * Create nested bean handler.


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/spi/factory/PropertyMap.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/config/support/SimpleAnnotationImpl.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean2.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/support/GetInstanceBean.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/BeanFactoryContextualInjectionTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/GetInstanceTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/NullifyTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/BeanFactoryContextualInjectionTestCase.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/GetInstanceTestCase.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/NullifyTestCase.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/xml/test/DemandWithTargetState.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/kernel/deployment/xml/test/InjectionWithSearch.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   -

More information about the jboss-cvs-commits mailing list