From: <cl...@hy...> - 2008-11-02 00:08:44
|
Author: clee Date: 2008-11-01 17:08:38 -0700 (Sat, 01 Nov 2008) New Revision: 11676 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11676 Modified: branches/HQ_4_0/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java Log: [HHQ-2614] Only match endsWith() if the FQDN matches (merge from HEAD) Modified: branches/HQ_4_0/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java =================================================================== --- branches/HQ_4_0/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2008-11-02 00:06:11 UTC (rev 11675) +++ branches/HQ_4_0/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2008-11-02 00:08:38 UTC (rev 11676) @@ -470,13 +470,16 @@ for (Iterator j=aiServices.iterator(); j.hasNext(); ) { aiSvc = (AIServiceValue) j.next(); String subname = aiSvc.getName(); - // Get rid of the FQDN - if (aiSvc.getName().startsWith(fqdn)) { - subname = subname.substring(fqdn.length() - 1); + if (found = appdefSvc.getName().equals(subname)) { + break; } - - if (found = appdefSvc.getName().endsWith(subname)) - break; + else if (aiSvc.getName().startsWith(fqdn)) { + // Get rid of the FQDN + subname = subname.substring(fqdn.length()); + + if (found = appdefSvc.getName().endsWith(subname)) + break; + } } if (found) { |