From: <pn...@hy...> - 2008-08-08 23:20:48
|
Author: pnguyen Date: 2008-08-08 16:20:46 -0700 (Fri, 08 Aug 2008) New Revision: 10590 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10590 Modified: branches/HQ_3_2/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java Log: HQ-1348: Don't start escalation if alert (recovery) is already fixed Modified: branches/HQ_3_2/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java 2008-08-08 23:18:41 UTC (rev 10589) +++ branches/HQ_3_2/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java 2008-08-08 23:20:46 UTC (rev 10590) @@ -324,11 +324,16 @@ try { Escalatable alert = creator.createEscalatable(); - EscalationState curState = new EscalationState(alert); - _stateDAO.save(curState); - _log.debug("Escalation started: state=" + curState.getId()); - EscalationRuntime.getInstance().scheduleEscalation(curState); - started = true; + + // HQ-1348: Recovery alerts are automatically fixed + // so don't start escalation if the alert is fixed + if (!alert.getAlertInfo().isFixed()) { + EscalationState curState = new EscalationState(alert); + _stateDAO.save(curState); + _log.debug("Escalation started: state=" + curState.getId()); + EscalationRuntime.getInstance().scheduleEscalation(curState); + started = true; + } } finally { if (!started) { EscalationRuntime.getInstance() |