From: <tk...@hy...> - 2007-09-11 16:55:39
|
Author: tkeeney Date: 2007-09-11 09:55:35 -0700 (Tue, 11 Sep 2007) New Revision: 5875 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=5875 Modified: trunk/src/org/hyperic/hq/events/server/session/ActionManagerEJBImpl.java trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java trunk/src/org/hyperic/hq/events/server/session/ClassicEscalationAlertType.java Log: [HQ-918] mtime should be updated when assigning escalations and/or classic notifications to classic alert defs. Modified: trunk/src/org/hyperic/hq/events/server/session/ActionManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/ActionManagerEJBImpl.java 2007-09-11 12:47:42 UTC (rev 5874) +++ trunk/src/org/hyperic/hq/events/server/session/ActionManagerEJBImpl.java 2007-09-11 16:55:35 UTC (rev 5875) @@ -111,7 +111,9 @@ */ public Action createAction(AlertDefinition def, ActionValue val, Action parent) { - return def.createAction(val, parent); + Action action = def.createAction(val, parent); + def.setMtime(System.currentTimeMillis()); + return action; } /** @@ -125,6 +127,8 @@ action.setActionValue(val); setParentAction(val, action); + long mtime = System.currentTimeMillis(); + action.getAlertDefinition().setMtime(mtime); // Then find and update the child actions. @@ -137,6 +141,7 @@ Action act = (Action) i.next(); act.setActionValue(val); setParentAction(val, act); + act.getAlertDefinition().setMtime(mtime); } return action.getActionValue(); Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2007-09-11 12:47:42 UTC (rev 5874) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2007-09-11 16:55:35 UTC (rev 5875) @@ -477,6 +477,7 @@ EscalationManagerEJBImpl.getOne().findById(escId); def.setEscalation(escl); + def.setMtime(System.currentTimeMillis()); } /** Modified: trunk/src/org/hyperic/hq/events/server/session/ClassicEscalationAlertType.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/ClassicEscalationAlertType.java 2007-09-11 12:47:42 UTC (rev 5874) +++ trunk/src/org/hyperic/hq/events/server/session/ClassicEscalationAlertType.java 2007-09-11 16:55:35 UTC (rev 5875) @@ -97,11 +97,14 @@ AlertDefinitionManagerLocal defMan = getDefMan(); AlertDefinition def = defMan.getByIdNoCheck(defId, false); def.setEscalation(escalation); + long mtime = System.currentTimeMillis(); + def.setMtime(mtime); Collection children = def.getChildren(); for (Iterator it = children.iterator(); it.hasNext(); ) { def = (AlertDefinition) it.next(); def.setEscalation(escalation); + def.setMtime(mtime); } } catch(FinderException e) { |