From: <cl...@hy...> - 2008-10-24 19:46:51
|
Author: clee Date: 2008-10-24 12:46:41 -0700 (Fri, 24 Oct 2008) New Revision: 11592 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11592 Modified: trunk/src/org/hyperic/hq/measurement/agent/server/ScheduleThread.java Log: [HHQ-2609] Need to make sure that the entity is a platform before unscheduling platform availability (reviewed by dougm, scottmf, and pguyen) Modified: trunk/src/org/hyperic/hq/measurement/agent/server/ScheduleThread.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/agent/server/ScheduleThread.java 2008-10-24 19:46:09 UTC (rev 11591) +++ trunk/src/org/hyperic/hq/measurement/agent/server/ScheduleThread.java 2008-10-24 19:46:41 UTC (rev 11592) @@ -145,8 +145,8 @@ { String key = ent.getAppdefKey(); ScheduledItem[] items = null; - if (_platformAvailSchedule != null && - ent.getID() == _platformAvailSchedule._id.getID()) { + if (ent.isPlatform() && _platformAvailSchedule != null && + ent.equals(_platformAvailSchedule._id)) { items = _platformAvailSchedule._schedule.getScheduledItems(); _platformAvailSchedule = null; _log.debug("Unscheduling metrics for Platform Availability"); @@ -182,6 +182,9 @@ final String platformTemplate = ("system.avail:Type=Platform:Availability").toLowerCase(); final String dsn = meas.getDSN().toLowerCase(); + if (_log.isDebugEnabled()) { + _log.debug("scheduleMeasurement " + dsn); + } if (dsn.endsWith(platformTemplate)) { _log.debug("Scheduling Platform Availability"); _platformAvailSchedule = new ResourceSchedule(); @@ -456,8 +459,16 @@ // so that we don't risk any metrics hanging and making the agent // seem unavailable if (_platformAvailSchedule != null) { + if (_log.isDebugEnabled()) { + _log.debug("Platform schedule is not null"); + } collect(_platformAvailSchedule); } + else { + if (_log.isDebugEnabled()) { + _log.debug("Platform schedule is null"); + } + } if (_schedules.size() == 0) { //nothing scheduled |