[rhq-project/rhq] f0826c: [1174841] UnsupportedOperationException on mergeIn...
by Jay Shaughnessy
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>
9 years, 1 month
[rhq-project/rhq] 2b7788: Bug 1188751 - Deploying Versioned WAR package from...
by Libor Zoubek
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 2b77882f348095bebffc63e5a5461831d78d3bcb
https://github.com/rhq-project/rhq/commit/2b77882f348095bebffc63e5a546183...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/Deployer.java
Log Message:
-----------
Bug 1188751 - Deploying Versioned WAR package from repository to JBOSS EAP 6
deployment resource fails
Support for updating package content for versioned deployments. This is
performed by removing the original deployment and deploying the new one -
using just redeploy wouln't work. In case of versioned DomainDeployment we
unassign it to all server-groups, replace content and then assign back to
the same server-groups.
This commit also extracts code for setting deployment metadata on AS7 into
Deployer class.
Commit: 48e5671bb20dc1a337291f335a66da5634226e50
https://github.com/rhq-project/rhq/commit/48e5671bb20dc1a337291f335a66da5...
Author: Libor Zoubek <lzoubek(a)jezzovo.net>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/Deployer.java
Log Message:
-----------
Merge pull request #163 from lzoubek/bugs/1188751
Bug 1188751 - Deploying Versioned WAR package from repository to JBOSS EAP 6 deployment resource fails
Compare: https://github.com/rhq-project/rhq/compare/f41bcf99fedb...48e5671bb20d
9 years, 1 month
