Merging from trunk r1618840:1619054 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620349 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 26 deletions

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,