modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 4 ---- 1 file changed, 4 deletions(-)
New commits: commit e8dcb395feaa2ae567521ee4ebfb0de5765103e7 Author: Ian Springer ian.springer@redhat.com Date: Thu May 24 15:07:21 2012 -0400
[823942] Prefer resource container Resource when recursing hierarchy Given recent optimizations it's necessary to use the ResourceContainer's version of a resource when requiring the most up to date version of the resource. This commit ensures that when walking the hierarchy we prefer the container's version of the resource when getting children.
(fix conflict in MeasurementManager that I missed when I committed 9e0b16da1)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java index 8e47662..7a82cdb 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java @@ -197,11 +197,7 @@ public class MeasurementManager extends AgentService implements MeasurementAgent scheduleCollection(resourceId, schedules); }
-<<<<<<< HEAD - for (Resource child : resource.getChildResources()) { -======= for (Resource child : this.inventoryManager.getContainerChildren(container)) { ->>>>>>> 14d53ea... [823942] Prefer resource container Resource when recursing hierarchy reschedule(child); } }
rhq-commits@lists.fedorahosted.org