Branch: refs/heads/jshaughn/bz1174841 Home: https://github.com/rhq-project/rhq Commit: 9c374100de109ffa2f759a16b96da5ec20dc8a9a https://github.com/rhq-project/rhq/commit/9c374100de109ffa2f759a16b96da5ec20... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-12-17 (Wed, 17 Dec 2014)

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).