Branch: refs/heads/BZ/1187645/JON331 Home: https://github.com/rhq-project/rhq Commit: 04c1587528da117cc37425da56dc946af6c778e4 https://github.com/rhq-project/rhq/commit/04c1587528da117cc37425da56dc946... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2015-02-27 (Fri, 27 Feb 2015) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java Log Message: ----------- [1174841] UnsupportedOperationException on mergeInventoryReport() Avoid the use of Iterator.remove() because Resources coming from the Agent may be using a customized impl for Resource.childResources (like CopyOnWriteArraySet). The solution "lazily protects" because the problem scenario is rare (restype reported by agent is not present on the server) and we don't want to do any unnecessary work (like changing the Set impl in advance). (cherry picked from commit 9c374100de109ffa2f759a16b96da5ec20dc8a9a)