[Hyperic-hq-discuss] hq r14362 - trunk/src/org/hyperic/hq/events/server/session

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

Author: scottmf
Date: 2010-03-09 10:47:14 -0800 (Tue, 09 Mar 2010)
New Revision: 14362
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14362

Modified:
   trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java
Log:
add check for async delete

Modified: trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java	2010-03-09 18:39:54 UTC (rev 14361)
+++ trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java	2010-03-09 18:47:14 UTC (rev 14362)
@@ -661,8 +661,11 @@
      */
     public String getShortReason(Alert alert) {
         AlertDefinition def = alert.getAlertDefinition();
-        AppdefEntityID aeid =
-            new AppdefEntityID(def.getResource());
+        Resource r = def.getResource();
+        if (r == null || r.isInAsyncDeleteState()) {
+            return "alertid=" + alert.getId() + " is associated with an invalid or deleted resource";
+        }
+        AppdefEntityID aeid = new AppdefEntityID(r);
         AppdefEntityValue aev = new AppdefEntityValue(
             aeid, AuthzSubjectManagerEJBImpl.getOne().getOverlordPojo());