[jboss-cvs] JBossAS SVN: r114546 - projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3.

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

Author: ehugonnet
Date: 2013-10-24 11:24:16 -0400 (Thu, 24 Oct 2013)
New Revision: 114546

Modified:
   projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
JBPAPP-9411 : looking for container annotation configuration for default EJB3 SecurityDomain if none is defined elsewhere (annotation or xml configuration).


Modified: projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java	2013-10-24 11:31:48 UTC (rev 114545)
+++ projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java	2013-10-24 15:24:16 UTC (rev 114546)
@@ -1129,13 +1129,17 @@
       } else if (dd.getUnauthenticatedPrincipal() != null)
       {
          SecurityDomain annotation = ejbClass.getAnnotation(SecurityDomain.class);
+         if(annotation == null)
+         {
+             annotation = container.getAnnotation(SecurityDomain.class, ejbClass);
+         }
          SecurityDomainImpl override;
          if (annotation != null)
          {
             override = new SecurityDomainImpl(annotation.value());
             override.setUnauthenticatedPrincipal(dd
                   .getUnauthenticatedPrincipal());
-         }
+         }      
          else
          {
             override = new SecurityDomainImpl();