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

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

Author: anil.saldhana at jboss.com
Date: 2008-06-12 01:33:02 -0400 (Thu, 12 Jun 2008)
New Revision: 74464

Modified:
   trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java
Log:
JBAS-5622: apply the domain caller mapping after the first attempt at getting caller principal

Modified: trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java	2008-06-12 04:56:10 UTC (rev 74463)
+++ trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java	2008-06-12 05:33:02 UTC (rev 74464)
@@ -370,6 +370,12 @@
             {
                log.error("Error getting callerPrincipal for " + con.getBeanClass(),e);
             }
+            
+            /* Apply any domain caller mapping. This should really only be
+            done for non-run-as callers.
+            */
+            if (rm != null)
+               caller = rm.getPrincipal(caller);
              
             if( caller == null )
             {