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 2014/12/01 15:56:53 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5464
Repository: activemq
Updated Branches:
refs/heads/trunk 0ca376d54 -> 9797d3b95
https://issues.apache.org/jira/browse/AMQ-5464
Apply patch from gemmellr to allow Configuration' TerminusDurability to
imply a durable subscription as well.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9797d3b9
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9797d3b9
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9797d3b9
Branch: refs/heads/trunk
Commit: 9797d3b9575c49d2ed3b5eef1aea51d70d3d508e
Parents: 0ca376d
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Dec 1 09:56:37 2014 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Dec 1 09:56:37 2014 -0500
----------------------------------------------------------------------
.../activemq/transport/amqp/AmqpProtocolConverter.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/9797d3b9/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
index 444cdb5..a08e08b 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
@@ -69,7 +69,14 @@ import org.apache.qpid.proton.Proton;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.DescribedType;
import org.apache.qpid.proton.amqp.Symbol;
-import org.apache.qpid.proton.amqp.messaging.*;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
+import org.apache.qpid.proton.amqp.messaging.Modified;
+import org.apache.qpid.proton.amqp.messaging.Outcome;
+import org.apache.qpid.proton.amqp.messaging.Rejected;
+import org.apache.qpid.proton.amqp.messaging.Released;
+import org.apache.qpid.proton.amqp.messaging.Target;
+import org.apache.qpid.proton.amqp.messaging.TerminusDurability;
import org.apache.qpid.proton.amqp.transaction.Coordinator;
import org.apache.qpid.proton.amqp.transaction.Declare;
import org.apache.qpid.proton.amqp.transaction.Declared;
@@ -1352,7 +1359,8 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
if (source.getDistributionMode() == COPY && dest.isQueue()) {
consumerInfo.setBrowser(true);
}
- if (TerminusDurability.UNSETTLED_STATE.equals(source.getDurable()) && dest.isTopic()) {
+ if ((TerminusDurability.UNSETTLED_STATE.equals(source.getDurable()) ||
+ TerminusDurability.CONFIGURATION.equals(source.getDurable())) && dest.isTopic()) {
consumerInfo.setSubscriptionName(sender.getName());
}