javacommons/security/javasrc.cdc/com/nokia/mj/impl/security/midp/authorization/PermissionGranter.java
equal
deleted
inserted
replaced
357 { |
357 { |
358 PolicyBasedPermission permission = |
358 PolicyBasedPermission permission = |
359 ((PolicyBasedPermission)grantedPermissions.elementAt(i)); |
359 ((PolicyBasedPermission)grantedPermissions.elementAt(i)); |
360 UserSecuritySettings settings = |
360 UserSecuritySettings settings = |
361 permission.getUserSecuritySettings(); |
361 permission.getUserSecuritySettings(); |
362 if (settings == null) |
362 if (permission.getType() != PolicyBasedPermission.USER_TYPE |
|
363 || settings == null) |
363 { |
364 { |
364 // not a user permission -> move on to the next permission |
365 // not a user permission -> move on to the next permission |
365 Logger.log("Permission " + permission.getName() + " is not a user permission, therefore is is not returned as part of the group of blanket permissions"); |
366 Logger.log("Permission " + permission.getName() + " is not a user permission, therefore is is not returned as part of the group of blanket permissions"); |
366 continue; |
367 continue; |
367 } |
368 } |
584 if (policyPermissions != null) |
585 if (policyPermissions != null) |
585 { |
586 { |
586 for (int i=0; i<policyPermissions.length; i++) |
587 for (int i=0; i<policyPermissions.length; i++) |
587 { |
588 { |
588 if (policyPermissions[i].getType() |
589 if (policyPermissions[i].getType() |
589 == PolicyBasedPermission.ASSIGNED_TYPE) |
590 == PolicyBasedPermission.ASSIGNED_TYPE |
|
591 || policyPermissions[i].getType() |
|
592 == PolicyBasedPermission.USER_ASSIGNED_TYPE) |
590 { |
593 { |
591 PolicyBasedPermissionImpl p1 = new PolicyBasedPermissionImpl( |
594 PolicyBasedPermissionImpl p1 = new PolicyBasedPermissionImpl( |
592 policyPermissions[i]); |
595 policyPermissions[i]); |
593 // add it only if not contained already |
596 // add it only if not contained already |
594 boolean found = false; |
597 boolean found = false; |
607 resolvedPermissions.addElement( |
610 resolvedPermissions.addElement( |
608 new PolicyBasedPermissionImpl( |
611 new PolicyBasedPermissionImpl( |
609 policyPermissions[i].getName(), |
612 policyPermissions[i].getName(), |
610 policyPermissions[i].getTarget(), |
613 policyPermissions[i].getTarget(), |
611 policyPermissions[i].getActionList(), |
614 policyPermissions[i].getActionList(), |
|
615 policyPermissions[i].getType(), |
612 policyPermissions[i].getUserSecuritySettings())); |
616 policyPermissions[i].getUserSecuritySettings())); |
613 } |
617 } |
614 } |
618 } |
615 } |
619 } |
616 } |
620 } |