modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 58b53bf1c91ccafcb1af19b127911fd067c75a61 Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 7 16:21:57 2013 -0500
fix the cache so its used. this should speed up merge inventory
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 f604468..81f4815 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 @@ -1058,7 +1058,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot }
private boolean initResourceTypes(Resource resource) { - return initResourceTypes(resource, new HashMap<String, ResourceType>()); + final HashMap<String, ResourceType> types = new HashMap<String, ResourceType>(); + try { + return initResourceTypes(resource, types); + } finally { + types.clear(); // help GC + } }
/** @@ -1088,6 +1093,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + "]. The Agent most likely has a plugin named '" + plugin + "' installed that is not installed on the Server. Resource will be ignored..."); return false; + } else { + loadedTypeMap.put(key.toString(), resourceType); } }
rhq-commits@lists.fedorahosted.org