diff options
Diffstat (limited to 'java')
3 files changed, 8 insertions, 7 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java index dba8049657..39c4c28baf 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java @@ -579,7 +579,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j Content data = new Content(Content.TypeEnum.INLINE_T, payload); - doMessageTransfer(messageHeaders,destination,data,message,deliveryMode,priority,timeToLive,immediate); + doMessageTransfer(messageHeaders,destination,data,message,deliveryMode,priority,timeToLive,mandatory,immediate); } else { // Reference message case // Sequence is as follows @@ -599,7 +599,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j // Message.Transfer Content data = new Content(Content.TypeEnum.REF_T, referenceId.getBytes()); - doMessageTransfer(messageHeaders,destination,data,message,deliveryMode,priority,timeToLive,immediate); + doMessageTransfer(messageHeaders,destination,data,message,deliveryMode,priority,timeToLive,mandatory,immediate); //Message.Append for(Iterator it = content.iterator(); it.hasNext();){ @@ -622,7 +622,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j } private void doMessageTransfer(MessageHeaders messageHeaders,AMQDestination destination, Content content, AbstractJMSMessage message, int deliveryMode, int priority, - long timeToLive, boolean immediate)throws JMSException{ + long timeToLive, boolean mandatory, boolean immediate)throws JMSException{ try { AMQMethodBody methodBody = MessageTransferBody.createMethodBody( @@ -638,6 +638,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j destination.getExchangeName(), // String exchange messageHeaders.getExpiration(), // long expiration immediate, // boolean immediate + mandatory, // boolean mandatory messageHeaders.getMessageId(), // String messageId (short)priority, // short priority message.getJMSRedelivered(), // boolean redelivered diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml index 711efc4481..f70e1263bd 100644 --- a/java/common/protocol-version.xml +++ b/java/common/protocol-version.xml @@ -27,8 +27,8 @@ <property name="generated.dir" location="${generated.path}/${generated.package}" /> <property name="generated.timestamp" location="${generated.dir}/timestamp" /> <property name="xml.spec.dir" location="${topDirectoryLocation}/../specs" /> - <property name="xml.spec.deps" value="amqp.0-9.xml cluster.0-9.xml exchange-bound.0-9.xml amqp-nogen.0-9.xml" /> - <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/exchange-bound.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" /> + <property name="xml.spec.deps" value="amqp.0-9.xml amqp-errata.0-9.xml cluster.0-9.xml exchange-bound.0-9.xml amqp-nogen.0-9.xml" /> + <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/amqp-errata.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/exchange-bound.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" /> <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired"> <mkdir dir="${generated.dir}"/> diff --git a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java index cd63a60c04..836c4ad985 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java +++ b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java @@ -75,8 +75,6 @@ public class RequestManager long requestId = getNextRequestId(); // Get new request ID AMQFrame requestFrame = AMQRequestBody.createAMQFrame(channel, requestId, lastProcessedResponseId, requestMethodBody); - requestSentMap.put(requestId, methodListener); - protocolWriter.writeFrame(requestFrame); if (logger.isDebugEnabled()) { logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + @@ -84,6 +82,8 @@ public class RequestManager } //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + // "] TX REQ: Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); + requestSentMap.put(requestId, methodListener); + protocolWriter.writeFrame(requestFrame); return requestId; } |