[Hyperic-hq-discuss] hq r11306 - in trunk/src/org/hyperic/hq: bizapp/server/session control/server/session

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

Author: clee
Date: 2008-09-25 22:15:40 -0700 (Thu, 25 Sep 2008)
New Revision: 11306
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11306

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/ControlBossEJBImpl.java
   trunk/src/org/hyperic/hq/control/server/session/ControlManagerEJBImpl.java
Log:
Safer to use isGroup() convenience method than comparing field to a defined constant

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/ControlBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/ControlBossEJBImpl.java	2008-09-26 01:09:40 UTC (rev 11305)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/ControlBossEJBImpl.java	2008-09-26 05:15:40 UTC (rev 11306)
@@ -107,7 +107,7 @@
                PermissionException, AppdefEntityNotFoundException
                
     {
-        if (id.getType() == AppdefEntityConstants.APPDEF_TYPE_GROUP) {
+        if (id.isGroup()) {
             doGroupAction(sessionId, id, action, args, null);
         } else {
             AuthzSubject subject = sessionManager.getSubject(sessionId);
@@ -131,7 +131,7 @@
                PermissionException, AppdefEntityNotFoundException,
                GroupNotCompatibleException, ApplicationException
     {
-        if (id.getType() == AppdefEntityConstants.APPDEF_TYPE_GROUP) {
+        if (id.isGroup()) {
             doGroupAction(sessionId, id, action, null, schedule);
         } else {
             AuthzSubject subject = sessionManager.getSubject(sessionId);
@@ -330,7 +330,7 @@
                SessionNotFoundException, SessionTimeoutException,
                PermissionException, AppdefGroupNotFoundException
     {
-        if (id.getType() != AppdefEntityConstants.APPDEF_TYPE_GROUP)
+        if (!id.isGroup())
           throw new IllegalArgumentException ("Invalid group entity specified");
 
         AuthzSubject subject = sessionManager.getSubject(sessionId);

Modified: trunk/src/org/hyperic/hq/control/server/session/ControlManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/control/server/session/ControlManagerEJBImpl.java	2008-09-26 01:09:40 UTC (rev 11305)
+++ trunk/src/org/hyperic/hq/control/server/session/ControlManagerEJBImpl.java	2008-09-26 05:15:40 UTC (rev 11306)
@@ -178,7 +178,7 @@
         throws PluginException, PermissionException
     {
         // This method doesn't support groups.
-        if (id.getType() == AppdefEntityConstants.APPDEF_TYPE_GROUP)
+        if (id.isGroup())
             throw new IllegalArgumentException ("Cannot perform single "+
                                                 "action on a group.");
     
@@ -198,7 +198,7 @@
         throws PluginException, PermissionException, SchedulerException
     {
         // This method doesn't support groups.
-        if (id.getType() == AppdefEntityConstants.APPDEF_TYPE_GROUP)
+        if (id.isGroup())
             throw new IllegalArgumentException ("Cannot perform single "+
                                                 "action on a group.");