Branch: refs/heads/release/jon3.3.x
Home:
https://github.com/rhq-project/rhq
Commit: f0826cd19dd64453eea458f69dcd2c5fc9973956
https://github.com/rhq-project/rhq/commit/f0826cd19dd64453eea458f69dcd2c5...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 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)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>