JBEAP-6196 ARTEMIS-734 Message expired while being moved on the clust… #165
Conversation
…er bridge does not follow the address setting configuration. (cherry picked from commit 2509eeb)
|
Can someone review this? This one is identified as part of 7.0.6 payload. |
|
@mtaylor @clebertsuconic We have the component freeze for EAP 7.0.6 on Mar-24 Fri. Please let us know what is needed to move this forward, thanks. |
|
There were 4 commits associated with the JIRA outlined in the commit message. Some improvements and tests were added. These will need to be cherry-picked as well. Leave it with me, I'll do the necessary bits. |
|
Do you mean #120 ? |
|
@clebertsuconic Yes I meant the same commits from #120 actually there should be 3 commits as one does not apply. |
|
@soul2zimate I am a little confused here, I can see: e5696ea Which is a commit with the exact same title as the one here, but with a different diff. Is the purpose of this pull request to modify the original commit (was there some issue with cherry-pick/conflict resolution in the original cherry-pick?) |
|
It seems it has been modified for some reason last time, But I can not figure out why this strangely happened in #120 |
|
@soul2zimate I suspect there were some merge conflicts and this was modified. |
…er bridge does not follow the address setting configuration.
(cherry picked from commit 2509eeb)
This is for 7.0.z issue https://issues.jboss.org/browse/JBEAP-6196
The previous #120 is incomplete. See History for QueueImpl.java at https://github.com/rh-messaging/jboss-activemq-artemis/commits/jboss-1.1.0-x/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java Commits on Sep 28, 2016. The actual commit content e5696ea is different than 2509eeb from jboss-1.5.3-x branch.
It seems that the real commit has been changed for some reason in cherry-pick.