[Hyperic-hq-discuss] hq r14588 - trunk/src/org/hyperic/hq/authz/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2010-05-11 12:19:38 -0700 (Tue, 11 May 2010)
New Revision: 14588
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14588

Modified:
   trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java
Log:
[HHQ-3977] added NPE checks against the associated group

Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java	2010-05-11 17:45:16 UTC (rev 14587)
+++ trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java	2010-05-11 19:19:38 UTC (rev 14588)
@@ -443,16 +443,18 @@
     /**
      * @ejb:interface-method
      */
-    public void removeResource(AuthzSubject subject, Resource r)
-        throws VetoException
-    {
-        ResourceDeleteCallback cb =
-            AuthzStartupListener.getResourceDeleteCallback();
+    public void removeResource(AuthzSubject subject, Resource r) throws VetoException {
+        if (r == null) {
+            return;
+        }
+        ResourceDeleteCallback cb = AuthzStartupListener.getResourceDeleteCallback();
         cb.preResourceDelete(r);
-
         final long now = System.currentTimeMillis();
         ResourceAudit.deleteResource(r, subject, now, now);        
-        r.getGroupBag().clear();
+        Collection groupBag = r.getGroupBag();
+        if (groupBag != null) {
+            groupBag.clear();
+        }
         getResourceDAO().remove(r);
     }