You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/09/15 13:03:06 UTC
[1/2] activemq git commit: AMQ-6808 preserve destination for browsed
scheduled messages
Repository: activemq
Updated Branches:
refs/heads/master a359d8152 -> 31f507001
AMQ-6808 preserve destination for browsed scheduled messages
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c691124d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c691124d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c691124d
Branch: refs/heads/master
Commit: c691124d3288ffc9299bedca69b952952f2cbcf6
Parents: a359d81
Author: Erik Wramner <er...@codemint.com>
Authored: Tue Sep 12 21:46:02 2017 +0200
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 15 09:02:36 2017 -0400
----------------------------------------------------------------------
.../org/apache/activemq/broker/scheduler/SchedulerBroker.java | 4 ++++
.../activemq/broker/scheduler/JobSchedulerManagementTest.java | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c691124d/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
index a00b456..5542973 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
@@ -426,6 +426,10 @@ public class SchedulerBroker extends BrokerFilter implements JobListener {
msg.setPersistent(false);
msg.setType(AdvisorySupport.ADIVSORY_MESSAGE_TYPE);
msg.setMessageId(new MessageId(this.producerId, this.messageIdGenerator.getNextSequenceId()));
+
+ // Preserve original destination
+ msg.setOriginalDestination(msg.getDestination());
+
msg.setDestination(replyTo);
msg.setResponseRequired(false);
msg.setProducerId(this.producerId);
http://git-wip-us.apache.org/repos/asf/activemq/blob/c691124d/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
index c944be3..6f6dc76 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
@@ -34,6 +34,7 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import org.apache.activemq.ScheduledMessage;
+import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.util.IdGenerator;
import org.junit.Test;
import org.slf4j.Logger;
@@ -396,6 +397,9 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
assertNotNull(message);
assertEquals(45000, message.getLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY));
+ // Verify that original destination was preserved
+ assertEquals(destination, ((ActiveMQMessage) message).getOriginalDestination());
+
// Now check if there are anymore, there shouldn't be
message = browser.receive(5000);
assertNull(message);
[2/2] activemq git commit: This closes #259
Posted by ta...@apache.org.
This closes #259
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/31f50700
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/31f50700
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/31f50700
Branch: refs/heads/master
Commit: 31f507001acbc9a046f281b0f58802f35c36f4d0
Parents: a359d81 c691124
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 15 09:02:48 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 15 09:02:48 2017 -0400
----------------------------------------------------------------------
.../org/apache/activemq/broker/scheduler/SchedulerBroker.java | 4 ++++
.../activemq/broker/scheduler/JobSchedulerManagementTest.java | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------