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

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

Author: scottmf
Date: 2009-12-07 15:50:03 -0800 (Mon, 07 Dec 2009)
New Revision: 14050
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14050

Modified:
   trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java
Log:
[HHQ-3594] avoid NPE when updating an alert condition.

Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java	2009-12-07 23:49:40 UTC (rev 14049)
+++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java	2009-12-07 23:50:03 UTC (rev 14050)
@@ -1228,6 +1228,10 @@
                     AlertDefinition childDef = null;
                     for (Iterator it=def.getChildren().iterator(); it.hasNext(); ) {
                         childDef = (AlertDefinition) it.next();
+                        Resource r = childDef.getResource();
+                        if (r == null || r.isInAsyncDeleteState()) {
+                            continue;
+                        }
                         cache.remove(childDef.getAppdefEntityId());
                     }
                 }