From: <rm...@hy...> - 2007-04-05 18:47:42
|
Author: rmorgan Date: 2007-04-05 11:47:33 -0700 (Thu, 05 Apr 2007) New Revision: 4042 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=4042 Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplateDAO.java Log: Don't update the default interval or default on if it's been modified. [HQ-628] Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplateDAO.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplateDAO.java 2007-04-05 17:21:37 UTC (rev 4041) +++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplateDAO.java 2007-04-05 18:47:33 UTC (rev 4042) @@ -153,16 +153,19 @@ // Update the derived template for (Iterator i = mt.getRawMeasurementArgs().iterator(); i.hasNext();) { MeasurementArg raw = (MeasurementArg)i.next(); - MeasurementTemplate derived = raw.getTemplate(); - if (MeasurementConstants.TEMPL_IDENTITY - .equals(derived.getTemplate())) { - derived.setAlias(info.getAlias()); - derived.setDesignate(info.isIndicator()); - derived.setUnits(info.getUnits()); - derived.setCollectionType(info.getCollectionType()); - derived.setDefaultOn(info.isDefaultOn()); - derived.setDefaultInterval(info.getInterval()); - derived.setCategory(cat); + MeasurementTemplate t = raw.getTemplate(); + if (MeasurementConstants.TEMPL_IDENTITY.equals(t.getTemplate())) { + t.setAlias(info.getAlias()); + t.setDesignate(info.isIndicator()); + t.setUnits(info.getUnits()); + t.setCollectionType(info.getCollectionType()); + t.setCategory(cat); + + // Don't reset defaultOn or interval if it's been changed + if (t.getMtime() == t.getCtime()) { + t.setDefaultOn(info.isDefaultOn()); + t.setDefaultInterval(info.getInterval()); + } save(mt); return; } |