You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/04/05 17:00:15 UTC
qpid-jms git commit: QPIDJMS-166 Remove workaround for interop with
older proton releases, change has been in proton since 0.10.0
Repository: qpid-jms
Updated Branches:
refs/heads/master 536f966dd -> db4941afc
QPIDJMS-166 Remove workaround for interop with older proton releases,
change has been in proton since 0.10.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/db4941af
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/db4941af
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/db4941af
Branch: refs/heads/master
Commit: db4941afc3832aeae89efacaa54700009ba4032a
Parents: 536f966
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Apr 5 11:00:06 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Apr 5 11:00:06 2016 -0400
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpConsumer.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db4941af/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index 52d0db6..11a7b15 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -23,7 +23,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -48,7 +47,6 @@ import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.messaging.Accepted;
import org.apache.qpid.proton.amqp.messaging.Released;
import org.apache.qpid.proton.amqp.transaction.TransactionalState;
-import org.apache.qpid.proton.amqp.transport.DeliveryState;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.Receiver;
import org.apache.qpid.proton.message.Message;
@@ -230,7 +228,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
if (!isPresettle()) {
delivered.put(envelope, delivery);
}
- setDefaultDeliveryState(delivery, MODIFIED_FAILED);
+ delivery.setDefaultDeliveryState(MODIFIED_FAILED);
sendFlowIfNeeded();
} else if (ackType.equals(ACK_TYPE.ACCEPTED)) {
// A Consumer may not always send a DELIVERED ack so we need to
@@ -410,7 +408,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
}
private boolean processDelivery(Delivery incoming) throws Exception {
- setDefaultDeliveryState(incoming, Released.getInstance());
+ incoming.setDefaultDeliveryState(Released.getInstance());
Message amqpMessage = decodeIncomingMessage(incoming);
JmsMessage message = null;
try {
@@ -448,17 +446,6 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
return true;
}
- private void setDefaultDeliveryState(Delivery incoming, DeliveryState state) {
- // TODO: temporary to maintain runtime compatibility with older
- // Proton releases. Replace with direct invocation in future.
- try {
- Method m = incoming.getClass().getMethod("setDefaultDeliveryState", DeliveryState.class);
- m.invoke(incoming, state);
- } catch (Exception e) {
- LOG.trace("Exception while setting defaultDeliveryState", e);
- }
- }
-
protected long getNextIncomingSequenceNumber() {
return incomingSequence.incrementAndGet();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org