[jboss-cvs] JBossAS SVN: r65234 - branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel.

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

Author: bdecoste
Date: 2007-09-07 12:26:59 -0400 (Fri, 07 Sep 2007)
New Revision: 65234

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
Log:
[JBPAPP-259] corrected merge problems - synced with Branch_4_2

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-09-07 15:28:56 UTC (rev 65233)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-09-07 16:26:59 UTC (rev 65234)
@@ -94,7 +94,7 @@
    private PoolConfig poolConfig = null;
    
    /** The security-role-ref element(s) info */
-   private ArrayList<SecurityRoleRef> securityRoleRefs = new ArrayList<SecurityRoleRef>();
+   private Collection<SecurityRoleRef> securityRoleRefs = new HashSet<SecurityRoleRef>();
    
    
    public void addXmlAnnotation(XmlAnnotation annotation)
@@ -397,6 +397,7 @@
       sb.append(",methodAttributes=").append(methodAttributes);
       sb.append(",aopDomainName=").append(aopDomainName);
       sb.append(",dependencies=").append(dependencies);
+      sb.append(",securityRoleRefs=").append(securityRoleRefs);
       return sb.toString();
    }