diff options
Diffstat (limited to 'qpid/java')
2 files changed, 1 insertions, 26 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java index ec0c38ec42..db7ee54cb2 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java @@ -285,6 +285,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget implements FlowC else if(!msgCompressed && compressionSupported && (messageProps == null || messageProps.getContentEncoding()==null) + && body != null && body.remaining() > _session.getConnection().getMessageCompressionThreshold()) { byte[] compressed = GZIPUtils.compressBufferToArray(body); diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java index 71d07b1fa0..9748038b9b 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java @@ -20,14 +20,12 @@ */ package org.apache.qpid.client.message; -import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; -import java.util.zip.GZIPInputStream; import javax.jms.JMSException; @@ -164,30 +162,6 @@ public abstract class AbstractJMSMessageFactory implements MessageFactory return message; } - private ByteBuffer uncompressBody(final InputStream bodyInputStream) throws AMQException - { - final ByteBuffer data; - try(GZIPInputStream gzipInputStream = new GZIPInputStream(bodyInputStream)) - { - ByteArrayOutputStream uncompressedBuffer = new ByteArrayOutputStream(); - int read; - byte[] buf = new byte[4096]; - while((read = gzipInputStream.read(buf))!=-1) - { - uncompressedBuffer.write(buf,0,read); - } - byte[] uncompressedBytes = uncompressedBuffer.toByteArray(); - data = ByteBuffer.wrap(uncompressedBytes); - } - catch (IOException e) - { - // TODO - shouldn't happen - throw new AMQException("Error uncompressing gzipped message data", e); - } - return data; - } - - public AbstractJMSMessage createMessage(long messageNbr, boolean redelivered, ContentHeaderBody contentHeader, AMQShortString exchange, AMQShortString routingKey, List bodies, AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache, |