[jboss-cvs] JBossAS SVN: r104065 - trunk/server/src/main/java/org/jboss/ejb.

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

Author: mmoyses
Date: 2010-04-16 14:59:56 -0400 (Fri, 16 Apr 2010)
New Revision: 104065

Modified:
   trunk/server/src/main/java/org/jboss/ejb/EjbModule.java
Log:
JBAS-7951: fix warning for unsecured MDBs

Modified: trunk/server/src/main/java/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/EjbModule.java	2010-04-16 16:17:58 UTC (rev 104064)
+++ trunk/server/src/main/java/org/jboss/ejb/EjbModule.java	2010-04-16 18:59:56 UTC (rev 104065)
@@ -831,7 +831,8 @@
       // Set security domain manager
       String securityDomain = bean.getApplicationMetaData().getSecurityDomain();
       // JBAS-5960: Set default security domain if there is security metadata
-      if (securityDomain == null && hasSecurityMetaData(bean))
+      boolean hasSecurityMetaData = hasSecurityMetaData(bean);
+      if (securityDomain == null && hasSecurityMetaData)
       {
          securityDomain = SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY;
       }
@@ -877,8 +878,9 @@
       }
       else
       {
-         log.warn("EJB configured to bypass security. Please verify if this is intended. Bean=" + bean.getEjbName()
-               + " Deployment=" + unit.getName());
+         if ("".equals(securityDomain) && hasSecurityMetaData)
+            log.warn("EJB configured to bypass security. Please verify if this is intended. Bean=" + bean.getEjbName()
+                  + " Deployment=" + unit.getName());
       }
 
       // Load the security proxy instance if one was configured