[jboss-cvs] JBossAS SVN: r63124 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-17 16:22:57 -0400 (Thu, 17 May 2007)
New Revision: 63124

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
Log:
correct the check for authorizationinfo

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java	2007-05-17 20:22:13 UTC (rev 63123)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java	2007-05-17 20:22:57 UTC (rev 63124)
@@ -151,10 +151,8 @@
    //Private Methods  
    private void initializeModules(Resource resource) throws PrivilegedActionException
    { 
-      AuthorizationInfo authzInfo = getAuthorizationInfo(securityDomainName, resource);
+      AuthorizationInfo authzInfo = getAuthorizationInfo(securityDomainName, resource); 
       if(authzInfo == null)
-         authzInfo = getAuthorizationInfo(SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY, resource);
-      if(authzInfo == null)
          throw new IllegalStateException("Authorization Info is null");
       AuthorizationModuleEntry[] entries = authzInfo.getAuthorizationModuleEntry();
       int len = entries != null ? entries.length : 0;
@@ -308,6 +306,10 @@
       }
       if(aPolicy == null)
          throw new IllegalStateException("Application Policy is null for domain:"+ domainName);
+      
+      AuthorizationInfo ai = aPolicy.getAuthorizationInfo();
+      if(ai == null)
+         throw new IllegalStateException("Authorization Info not present for domain="+ domainName);
       return aPolicy.getAuthorizationInfo();
    } 
 }