[jboss-cvs] JBossAS SVN: r114776 - in projects/ejb3/trunk/security: src/main/java/org/jboss/ejb3/security/helpers and 1 other directory.

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

Author: wolfc
Date: 2014-03-24 17:41:56 -0400 (Mon, 24 Mar 2014)
New Revision: 114776

Modified:
   projects/ejb3/trunk/security/pom.xml
   projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java
Log:
JBPAPP-11037: ignore security role references that have no role link set


Modified: projects/ejb3/trunk/security/pom.xml
===================================================================
--- projects/ejb3/trunk/security/pom.xml	2014-03-24 14:30:55 UTC (rev 114775)
+++ projects/ejb3/trunk/security/pom.xml	2014-03-24 21:41:56 UTC (rev 114776)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.13</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 
@@ -22,6 +22,15 @@
   
   <build>
   
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
     
       <!-- Assembly Plugin -->

Modified: projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java
===================================================================
--- projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java	2014-03-24 14:30:55 UTC (rev 114775)
+++ projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java	2014-03-24 21:41:56 UTC (rev 114776)
@@ -151,6 +151,8 @@
       Set<SecurityRoleRef> srset = new HashSet<SecurityRoleRef>();
       for(SecurityRoleRefMetaData srmd: roleRefs)
       {
+         if (srmd.getRoleLink() == null)
+            continue;
          srset.add(new SecurityRoleRef(srmd.getRoleName(),srmd.getRoleLink(),null));
       }
       Principal principal = getCallerPrincipal(sc, rm, domain);