From 7a3eb589b3973522771c2b40b3ba89ac9cbfdb14 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 5 Aug 2008 20:04:55 +0000 Subject: QPID-1219: cleanup of prior commit (r682887) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@682915 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/nclient/impl/ClientSession.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'java/client/src') diff --git a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java index 089eb1bb17..27805a1f39 100644 --- a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java +++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java @@ -90,25 +90,12 @@ public class ClientSession extends org.apache.qpid.transport.Session implements { DeliveryProperties dp = msg.getDeliveryProperties(); MessageProperties mp = msg.getMessageProperties(); - Header header; - if (msg.getHeader() == null || dp.isDirty() || mp.isDirty()) - { - header = new Header(dp, mp); - msg.setHeader(header); - dp.setDirty(false); - mp.setDirty(false); - } - else - { - header = msg.getHeader(); - } - // The javadoc clearly says that this method is suitable for small messages - // therefore reading the content in one shot. ByteBuffer body = msg.readData(); int size = body.remaining(); super.messageTransfer (destination, MessageAcceptMode.get(acceptMode), - MessageAcquireMode.get(acquireMode), header, body); + MessageAcquireMode.get(acquireMode), + new Header(dp, mp), body); _currentDataSizeNotSynced += size; _currentDataSizeNotFlushed += size; } -- cgit v1.2.1