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

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

Author: kabir.khan at jboss.com
Date: 2008-05-29 12:40:55 -0400 (Thu, 29 May 2008)
New Revision: 73811

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
Log:
Only use the default manager bean and property names if the properties have not been set explicitly

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java	2008-05-29 15:31:54 UTC (rev 73810)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java	2008-05-29 16:40:55 UTC (rev 73811)
@@ -39,14 +39,21 @@
    
    /** The bean name of the aspect manager to use */
    protected String managerBean;
+   
+   /** Whether the managerBean was set using the setManagerBean accessor */
+   protected boolean managerBeanSet;
 
    /** The property of the aspect manager bean, if any, containing the aspect manager */
    protected String managerProperty;
 
+   /** Whether the managerProperty was set using the setManagerBean accessor */
+   protected boolean managerPropertySet;
+
    @XmlAttribute(name="manager-bean")
    public void setManagerBean(String managerBean)
    {
       this.managerBean = managerBean;
+      managerBeanSet = true;
    }
 
    public String getManagerBean()
@@ -58,6 +65,7 @@
    public void setManagerProperty(String aspectManagerProperty)
    {
       this.managerProperty = aspectManagerProperty;
+      managerPropertySet = true;
    }
    
    public String getManagerProperty()
@@ -72,8 +80,8 @@
 
    protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String propertyName)
    {
-      String bean = (managerBean != null && managerBean.length() > 0) ? managerBean : DefaultAspectManager.getManagerBeanName();
-      String property = (managerProperty != null && managerProperty.length() > 0) ? managerProperty : DefaultAspectManager.getManagerPropertyName();
+      String bean = managerBeanSet ? managerBean : DefaultAspectManager.getManagerBeanName();
+      String property = managerPropertySet ? managerProperty : DefaultAspectManager.getManagerPropertyName();
       setAspectManagerProperty(builder, propertyName, bean, property);
    }