From: <cl...@hy...> - 2008-11-13 20:24:48
|
Author: clee Date: 2008-11-13 12:24:44 -0800 (Thu, 13 Nov 2008) New Revision: 11776 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11776 Modified: trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java Log: [HQ-1313] If alert definition cannot be found, then the escalation has also ended Modified: trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java 2008-11-13 19:58:55 UTC (rev 11775) +++ trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java 2008-11-13 20:24:44 UTC (rev 11776) @@ -36,6 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.ObjectNotFoundException; import org.hyperic.dao.DAOFactory; import org.hyperic.hq.authz.server.session.AuthzSubject; import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; @@ -552,12 +553,16 @@ return true; } - PerformsEscalations def = s.getAlertType().findDefinition( + try { + PerformsEscalations def = s.getAlertType().findDefinition( new Integer(s.getAlertDefinitionId())); - - // galert defs may be deleted from the DB when the group is deleted, - // so we may get a null value. - return def == null || def.isDeleted(); + + // galert defs may be deleted from the DB when the group is deleted, + // so we may get a null value. + return def == null || def.isDeleted(); + } catch (ObjectNotFoundException e) { + return true; + } } /** |