Repository: tomee Updated Branches: refs/heads/master 3a6d014ec -> 9f84727c8
TOMEE-1940 durable consumer of JMS 2 on top of AMQ 5 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9f84727c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9f84727c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9f84727c Branch: refs/heads/master Commit: 9f84727c8e43252e28a34e1bf0393fa0fe9eb66b Parents: 3a6d014 Author: rmannibucau <rmannibu...@apache.org> Authored: Wed Sep 21 23:07:00 2016 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Wed Sep 21 23:07:00 2016 +0200 ---------------------------------------------------------------------- .../openejb/resource/activemq/jms2/JMSContextImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9f84727c/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java index 0a3c276..db975be 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java @@ -30,6 +30,7 @@ import javax.jms.JMSProducer; import javax.jms.JMSRuntimeException; import javax.jms.MapMessage; import javax.jms.Message; +import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.ObjectMessage; import javax.jms.Queue; @@ -238,9 +239,10 @@ public class JMSContextImpl implements JMSContext { @Override public JMSConsumer createDurableConsumer(final Topic topic, final String name) { try { - final JMSConsumerImpl consumer = new JMSConsumerImpl(this, session().createDurableConsumer(topic, name)); + // JMS 2 only: final JMSConsumerImpl consumer = new JMSConsumerImpl(this, session().createDurableConsumer(topic, name)); + final MessageConsumer delegate = session().createDurableSubscriber(topic, name); checkAutoStart(); - return consumer; + return new JMSConsumerImpl(this, delegate); } catch (final JMSException e) { throw toRuntimeException(e); } @@ -249,9 +251,10 @@ public class JMSContextImpl implements JMSContext { @Override public JMSConsumer createDurableConsumer(final Topic topic, final String name, final String messageSelector, final boolean noLocal) { try { - final JMSConsumerImpl consumer = new JMSConsumerImpl(this, session().createDurableConsumer(topic, name, messageSelector, noLocal)); + // JMS 2 only: final JMSConsumerImpl consumer = new JMSConsumerImpl(this, session().createDurableConsumer(topic, name, messageSelector, noLocal)); + final MessageConsumer delegate = session().createDurableSubscriber(topic, name, messageSelector, noLocal); checkAutoStart(); - return consumer; + return new JMSConsumerImpl(this, delegate); } catch (final JMSException e) { throw toRuntimeException(e); }
