Branch: refs/heads/release/jon3.2.x Home: https://github.com/rhq-project/rhq Commit: 0a0bfedeafa7f1f0354181ec28ffa5f9cd280a9a https://github.com/rhq-project/rhq/commit/0a0bfedeafa7f1f0354181ec28ffa5f9cd... Author: John Mazzitelli mazz@redhat.com Date: 2014-12-18 (Thu, 18 Dec 2014)

Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java M modules/enterprise/agent/src/main/resources/agent-configuration.xml M modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentConfigurationTest.java M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainerConfiguration.java M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainerConfigurationConstants.java A modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/ServiceContainerConfigurationTest.java M modules/enterprise/server/jar/src/main/resources/server-comm-configuration.xml

Log Message: ----------- BZ 1166383 - ensure a transport param is added to the remoting locator URL

(cherry picked from commit 2a2ffa4dc443f0064365e7ef56deee4b9e3c688d)

Conflicts: modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentConfigurationTest.java

Commit: 9cf449a0450c041e4609b67c5f86da9a17ccad84 https://github.com/rhq-project/rhq/commit/9cf449a0450c041e4609b67c5f86da9a17... Author: Larry O'Leary loleary@redhat.com Date: 2014-12-18 (Thu, 18 Dec 2014)

Changed paths: M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java

Log Message: ----------- BZ-1049009 - JBoss Remoting SSL transport fails due to stale connections

This is a bug in JBoss Remoting 2.2.2.SP8 and was identified in https://issues.jboss.org/browse/JBREM-1245. The fix from JBREM-1245 can not easily be ported to 2.2.2 due to the code basis being different.

To fix this without needing a new version of JBoss Remoting, the rawSend method has been updated to retry the request in the event that we receive an RMI exception wrapped around the SSLException. As this is only done on connection failure, the impact should be very low to normal operation of the comm layer. (cherry picked from commit 7160d4a1468f567654bea4ca60a625c3362a4492)

(cherry picked from commit 533a9ad74225fe952a1a553bf1c3588d98f35c06)

Compare: https://github.com/rhq-project/rhq/compare/97c4f6e937d6...9cf449a0450c