From: <rm...@hy...> - 2007-10-09 17:01:21
|
Author: rmorgan Date: 2007-10-09 10:01:13 -0700 (Tue, 09 Oct 2007) New Revision: 6160 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6160 Modified: trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java Log: Don't enable RT via runtime auto-discovery. RT configuration is still kept. Modified: trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java =================================================================== --- trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2007-10-09 16:51:27 UTC (rev 6159) +++ trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2007-10-09 17:01:13 UTC (rev 6160) @@ -606,13 +606,6 @@ return; } - // let's see if we should enable RT collection - // if there's a config on the inbound service object, we'll - // set rt to true - if(isRtEnabled(aiservice)) { - foundAppdefService.setServiceRt(true); - } - Integer serviceTypePK = foundAppdefService.getServiceType().getId(); String serviceOwnerName = server.getOwner(); @@ -639,12 +632,6 @@ foundAppdefService = AIConversionUtil.mergeAIServiceIntoService(aiservice, foundAppdefService); - // and while we're at it, let's see if we should enable RT - // collection if there's a config on the inbound service - // object, we'll set rt to true - if(isRtEnabled(aiservice)) { - foundAppdefService.setServiceRt(true); - } serviceMgr.updateService(subject, foundAppdefService); } @@ -698,9 +685,4 @@ private boolean isPlaceholder(AIServerExtValue aiserverExt) { return (aiserverExt != null && aiserverExt.getPlaceholder()); } - - private boolean isRtEnabled(AIServiceValue aiSvc) { - return (aiSvc.getResponseTimeConfig() != null && - aiSvc.getResponseTimeConfig().length > 0); - } } |