[Hyperic-hq-discuss] hq r14214 - trunk/src/org/hyperic/hq/appdef/server/session

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

Author: scottmf
Date: 2010-01-21 15:55:14 -0800 (Thu, 21 Jan 2010)
New Revision: 14214
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14214

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java
Log:
[HHQ-3676] fix potential NPE

Modified: trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java	2010-01-21 23:50:47 UTC (rev 14213)
+++ trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java	2010-01-21 23:55:14 UTC (rev 14214)
@@ -411,6 +411,11 @@
         List rtn = new ArrayList(services.size());
         for (Iterator it=services.iterator(); it.hasNext(); ) {
             AppServiceValue val = (AppServiceValue) it.next();
+            if (val == null || val.getService() == null ||
+                val.getService().getResource() == null ||
+                val.getService().getResource().isInAsyncDeleteState()) {
+                continue;
+            }
             rtn.add(val.getService().getResource());
         }
         return rtn;