Author: shane.bryzak(a)jboss.com Date: 2008-03-07 02:01:58 -0500 (Fri, 07 Mar 2008) New Revision: 7518 Modified: trunk/src/main/org/jboss/seam/security/Identity.java Log: fix unit test Modified: trunk/src/main/org/jboss/seam/security/Identity.java =================================================================== --- trunk/src/main/org/jboss/seam/security/Identity.java 2008-03-07 05:58:33 UTC (rev 7517) +++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-03-07 07:01:58 UTC (rev 7518) @@ -102,7 +102,11 @@ public void create() { subject = new Subject(); - permissionMapper = (PermissionMapper) Component.getInstance(PermissionMapper.class); + + if (Contexts.isApplicationContextActive()) + { + permissionMapper = (PermissionMapper) Component.getInstance(PermissionMapper.class); + } } public static boolean isSecurityEnabled() @@ -533,6 +537,8 @@ return true; } + if (permissionMapper == null) return false; + if (arg != null) { return permissionMapper.resolvePermission(arg[0], action); @@ -550,6 +556,8 @@ return true; } + if (permissionMapper == null) return false; + return permissionMapper.resolvePermission(target, action); }