[Hyperic-hq-discuss] hq r12751 - branches/HQ_4_1/src/org/hyperic/hq/measurement/server/session

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

Author: scottmf
Date: 2009-03-12 16:17:27 -0700 (Thu, 12 Mar 2009)
New Revision: 12751
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12751

Modified:
   branches/HQ_4_1/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
Log:
more checks for resource in async delete state

Modified: branches/HQ_4_1/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
===================================================================
--- branches/HQ_4_1/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2009-03-12 22:51:58 UTC (rev 12750)
+++ branches/HQ_4_1/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2009-03-12 23:17:27 UTC (rev 12751)
@@ -210,6 +210,9 @@
         throws MeasurementCreateException, TemplateNotFoundException
     {
         Resource resource = getResource(id);
+        if (resource == null || resource.isInAsyncDeleteState()) {
+            return Collections.EMPTY_LIST;
+        }
         ArrayList dmList   = new ArrayList();
 
         if(intervals.length != templates.length){
@@ -1231,6 +1234,10 @@
             ResourceZevent z = (ResourceZevent)i.next();
             AuthzSubject subject = aman.findSubjectById(z.getAuthzSubjectId());
             AppdefEntityID id = z.getAppdefEntityID();
+            final Resource r = getResource(id);
+            if (r == null || r.isInAsyncDeleteState()) {
+                continue;
+            }
             boolean isCreate, isRefresh;
     
             isCreate = z instanceof ResourceCreatedZevent;