From: <cl...@hy...> - 2007-08-31 00:22:57
|
Author: clee Date: 2007-08-30 17:22:54 -0700 (Thu, 30 Aug 2007) New Revision: 5760 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=5760 Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java Log: [HQ-834] Set resource to null only if we are forcibly deleting the alert definition Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2007-08-30 23:50:52 UTC (rev 5759) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2007-08-31 00:22:54 UTC (rev 5760) @@ -135,8 +135,10 @@ watch.markTimeEnd("delete children"); } - // Disassociate from Resource - alertdef.setResource(null); + if (force) { + // Disassociate from Resource so that the Resource can be deleted + alertdef.setResource(null); + } // Get rid of their triggers first watch.markTimeBegin("removeTriggers"); |