Repository: qpid-jms Updated Branches: refs/heads/master 69cb3e699 -> c0bc5f074
QPIDJMS-131 Allows the outbound message envelope to drive presettlement at the provider level. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c0bc5f07 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c0bc5f07 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c0bc5f07 Branch: refs/heads/master Commit: c0bc5f074e866858eb86792b4a4d5c121ac8c115 Parents: 69cb3e6 Author: Timothy Bish <tabish...@gmail.com> Authored: Mon Oct 19 18:11:30 2015 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Mon Oct 19 18:11:30 2015 -0400 ---------------------------------------------------------------------- .../apache/qpid/jms/message/JmsOutboundMessageDispatch.java | 9 +++++++++ .../apache/qpid/jms/provider/amqp/AmqpFixedProducer.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0bc5f07/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsOutboundMessageDispatch.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsOutboundMessageDispatch.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsOutboundMessageDispatch.java index 2533a42..7b817d9 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsOutboundMessageDispatch.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsOutboundMessageDispatch.java @@ -28,6 +28,7 @@ public class JmsOutboundMessageDispatch { private JmsMessage message; private JmsDestination destination; private boolean sendAsync; + private boolean presettle; private long dispatchId; public JmsDestination getDestination() { @@ -70,6 +71,14 @@ public class JmsOutboundMessageDispatch { this.dispatchId = dispatchId; } + public boolean isPresettle() { + return presettle; + } + + public void setPresettle(boolean presettle) { + this.presettle = presettle; + } + @Override public String toString() { StringBuilder value = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0bc5f07/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java index e2dbc39..7b2690e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java @@ -107,10 +107,10 @@ public class AmqpFixedProducer extends AmqpProducer { return; } - JmsMessageFacade facade = envelope.getMessage().getFacade(); - LOG.trace("Producer sending message: {}", envelope); + JmsMessageFacade facade = envelope.getMessage().getFacade(); + boolean presettle = envelope.isPresettle() || isPresettle(); Delivery delivery = null; if (presettle) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
