[rhq-project/rhq] 04c158: [1174841] UnsupportedOperationException on mergeIn...
by Jay Shaughnessy
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>
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)
8 years, 9 months
[rhq-project/rhq] 289920: Bug 1191727 - EAP 6 management plug-in fails to di...
by Libor Zoubek
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 289920aeb8d88c8a2a7f57f9a5327e3e2f19df39
https://github.com/rhq-project/rhq/commit/289920aeb8d88c8a2a7f57f9a5327e3...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ExpressionResolver.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResolveExpression.java
Log Message:
-----------
Bug 1191727 - EAP 6 management plug-in fails to discover managed servers if
any of them use an expression for their auto-start or
socket-binding-port-offset attributes
Configuration loading for ManagedASComponent was updated so it also properly
evaluates expressions. RHQ Server then stores already evaluated values, this
would result overwriting expressions once configuration is updated.
Resolve auto-start or offset attributes in case they're expressions. This
commit also adds expressionResolver to BaseServerComponent for future use.
Note: EAP operation :resolve-expression is not defined on domain controller
in / address, but it is on individual /host=master host levels - thus
evaluates the expression in host's context.
x
8 years, 9 months