From: <cl...@hy...> - 2009-01-20 23:21:26
|
Author: clee Date: 2009-01-20 15:21:14 -0800 (Tue, 20 Jan 2009) New Revision: 12310 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12310 Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java Log: [HHQ-2738] Anticipate group members that have been deleted, but have not been purged Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java 2009-01-20 23:14:44 UTC (rev 12309) +++ trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java 2009-01-20 23:21:14 UTC (rev 12310) @@ -605,7 +605,11 @@ Map midMap = new HashMap(metrics.size()); for (Iterator it = metrics.iterator(); it.hasNext(); ) { Measurement m = (Measurement) it.next(); - midMap.put(new AppdefEntityID(m.getResource()), m.getId()); + try { + midMap.put(new AppdefEntityID(m.getResource()), m.getId()); + } catch (IllegalArgumentException e) { + // Resource has been deleted, waiting for purging. Ignore. + } } AppdefEntityID[] ids = getGroupMemberIDs(subject, gid); |