modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
New commits: commit 76a2ad16d3e45fc6a7aab59d273e7626deed23ad Author: John Mazzitelli mazz@redhat.com Date: Fri Feb 1 11:46:41 2013 -0500
just make it easier to debug this - rather than pass the find results directly in the argument list, put it in a local var
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index d5d7128..38636b3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -386,11 +386,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * @param servers the servers in inventory */ public void updateAgentInventoryStatus(List<Resource> platforms, List<Resource> servers) { + ResourceSyncInfo syncInfo; + for (Resource platform : platforms) { AgentClient agentClient = agentManager.getAgentClient(platform.getAgent()); try { - agentClient.getDiscoveryAgentService().synchronizeInventory( - entityManager.find(ResourceSyncInfo.class, platform.getId())); + syncInfo = entityManager.find(ResourceSyncInfo.class, platform.getId()); + agentClient.getDiscoveryAgentService().synchronizeInventory(syncInfo); } catch (Exception e) { log.warn("Could not perform commit synchronization with agent for platform [" + platform.getName() + "]", e); @@ -401,8 +403,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (!platforms.contains(server.getParentResource())) { AgentClient agentClient = agentManager.getAgentClient(server.getAgent()); try { - agentClient.getDiscoveryAgentService().synchronizeInventory( - entityManager.find(ResourceSyncInfo.class, server.getId())); + syncInfo = entityManager.find(ResourceSyncInfo.class, server.getId()); + agentClient.getDiscoveryAgentService().synchronizeInventory(syncInfo); } catch (Exception e) { log.warn("Could not perform commit synchronization with agent for server [" + server.getName() + "]", e);
rhq-commits@lists.fedorahosted.org