[Hyperic-hq-discuss] hq r14328 - in trunk/src/org/hyperic/hq: bizapp/server/session measurement/server/session

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

Author: scottmf
Date: 2010-02-26 16:37:42 -0800 (Fri, 26 Feb 2010)
New Revision: 14328
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14328

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
   trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
Log:
[HHQ-3759] added extra checking around async delete

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-02-27 00:27:00 UTC (rev 14327)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-02-27 00:37:42 UTC (rev 14328)
@@ -615,6 +615,9 @@
             }
             if (debug) watch.markTimeBegin("findResource size=" + size);
             final Resource res = rMan.findResource(id);
+            if (res == null || res.isInAsyncDeleteState()) {
+                continue;
+            }
             if (debug) watch.markTimeEnd("findResource size=" + size);
             List list;
             if (null != measCache

Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2010-02-27 00:27:00 UTC (rev 14327)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java	2010-02-27 00:37:42 UTC (rev 14328)
@@ -43,6 +43,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hibernate.ObjectNotFoundException;
 import org.hyperic.hq.appdef.Agent;
 import org.hyperic.hq.appdef.AppService;
 import org.hyperic.hq.appdef.server.session.AgentManagerEJBImpl;
@@ -809,7 +810,11 @@
             } else {
                 resource = resMan.findResourceById((Integer) o);
             }
-            if (resource == null || resource.isInAsyncDeleteState()) {
+            try {
+                if (resource == null || resource.isInAsyncDeleteState()) {
+                    continue;
+                }
+            } catch (ObjectNotFoundException e) {
                 continue;
             }
             final ResourceType type = resource.getResourceType();