From: <cl...@hy...> - 2008-10-21 06:24:18
|
Author: clee Date: 2008-10-20 23:24:12 -0700 (Mon, 20 Oct 2008) New Revision: 11544 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11544 Modified: trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java Log: [HHQ-2362] Pass the AIPlatform to be sure of the FQDN in the AI services (merge from HQ_3_2) Modified: trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java =================================================================== --- trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2008-10-21 06:21:05 UTC (rev 11543) +++ trunk/src/org/hyperic/hq/autoinventory/server/session/RuntimeReportProcessor.java 2008-10-21 06:24:12 UTC (rev 11544) @@ -255,8 +255,9 @@ for (int i = 0; i < aiservers.length; i++) { if(aiservers[i] != null) { - mergeServerIntoInventory(subject, appdefPlatform, aiservers[i], - appdefServers, reportingServer); + mergeServerIntoInventory(subject, appdefPlatform, aiplatform, + aiservers[i], appdefServers, + reportingServer); Util.flushCurrentSession(); } else { _log.error("Platform: " + appdefPlatform.getName() + @@ -278,6 +279,7 @@ /** * @param platform the platform that the server is on + * @param aiplatform the AIPlatform that is parent to the AI Server * @param aiserver the server we're going to merge into inventory * @param appdefServers the existing servers on the platform. * this method is expected to remove a server from this collection @@ -286,6 +288,7 @@ */ private void mergeServerIntoInventory(AuthzSubject subject, Platform platform, + AIPlatformValue aiplatform, AIServerValue aiserver, List appdefServers, Server reportingServer) @@ -457,7 +460,7 @@ aiSvc.setName(newName); } - String fqdn = platform.getFqdn(); + String fqdn = aiplatform.getFqdn(); // Filter out and mark zombie services for (Iterator i=appdefServices.iterator(); i.hasNext(); ) { |