[Hyperic-hq-discuss] hq r3829 - branches/HQ_3_0/src/org/hyperic/hq/authz/server/session

[<cl...@hy...>]

Author: clee
Date: 2007-03-22 16:28:14 -0800 (Thu, 22 Mar 2007)
New Revision: 3829
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3829

Modified:
   branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java
Log:
[HQ-608]
Superuser user should never be deleted [merge from HEAD]


Modified: branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java
===================================================================
--- branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java	2007-03-23 00:19:16 UTC (rev 3828)
+++ branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java	2007-03-23 00:28:14 UTC (rev 3829)
@@ -347,6 +347,11 @@
      */
     public void removeRole(AuthzSubjectValue whoami, Integer rolePk)
         throws RemoveException, PermissionException {
+        // Don't delete the super user role
+        if (rolePk.equals(AuthzConstants.rootRoleId)) {
+            throw new RemoveException("Superuser role cannot be removed");
+        }
+
         Role roleLocal = getRoleDAO().findById(rolePk);
 
         PermissionManager pm = PermissionManagerFactory.getInstance();