Fix and optimize Netty ResponseBodyParts bytes[], master close AsyncHttpClient#287

Author: Stephane Landelle

providers/netty/src/main/java/com/ning/http/client/providers/netty/NettyResponse.java

@@ -15,14 +15,6 @@
  */
 package com.ning.http.client.providers.netty;
 
-import com.ning.org.jboss.netty.handler.codec.http.CookieDecoder;
-import com.ning.http.client.Cookie;
-import com.ning.http.client.HttpResponseBodyPart;
-import com.ning.http.client.HttpResponseHeaders;
-import com.ning.http.client.HttpResponseStatus;
-import com.ning.http.client.providers.ResponseBase;
-import com.ning.http.util.AsyncHttpProviderUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -36,6 +28,15 @@
 import org.jboss.netty.buffer.ChannelBufferInputStream;
 import org.jboss.netty.buffer.ChannelBuffers;
 
+import com.ning.http.client.Cookie;
+import com.ning.http.client.HttpResponseBodyPart;
+import com.ning.http.client.HttpResponseHeaders;
+import com.ning.http.client.HttpResponseStatus;
+import com.ning.http.client.providers.ResponseBase;
+import com.ning.http.client.providers.netty.util.ChannelBufferUtil;
+import com.ning.http.util.AsyncHttpProviderUtils;
+import com.ning.org.jboss.netty.handler.codec.http.CookieDecoder;
+
 /**
  * Wrapper around the {@link com.ning.http.client.Response} API.
  */
@@ -75,7 +76,7 @@ protected List<Cookie> buildCookies() {
 
     /* @Override */
     public byte[] getResponseBodyAsBytes() throws IOException {
-        return getResponseBodyAsByteBuffer().array();
+        return ChannelBufferUtil.channelBuffer2bytes(getResponseBodyAsChannelBuffer());
     }
 
     /* @Override */

providers/netty/src/main/java/com/ning/http/client/providers/netty/ResponseBodyPart.java

@@ -15,12 +15,6 @@
  */
 package com.ning.http.client.providers.netty;
 
-import com.ning.http.client.AsyncHttpProvider;
-import com.ning.http.client.HttpResponseBodyPart;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,6 +23,14 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.handler.codec.http.HttpChunk;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+import com.ning.http.client.AsyncHttpProvider;
+import com.ning.http.client.HttpResponseBodyPart;
+import com.ning.http.client.providers.netty.util.ChannelBufferUtil;
+
 /**
  * A callback class used when an HTTP response body is received.
  */
@@ -66,20 +68,9 @@ public byte[] getBodyPartBytes() {
             return bp;
         }
 
-        ChannelBuffer b = getChannelBuffer();
-        int readable = b.readableBytes();
-        int readerIndex = b.readerIndex();
-        if (b.hasArray()) {
-            byte[] array = b.array();
-            if (b.arrayOffset() == 0 && readerIndex == 0 && array.length == readable) {
-                bytes.set(array);
-                return array;
-            }
-        }
-        byte[] array = new byte[readable];
-        b.getBytes(readerIndex, array);
-        bytes.set(array);
-        return array;
+        byte[] rb = ChannelBufferUtil.channelBuffer2bytes(getChannelBuffer());
+        bytes.set(rb);
+        return rb;
     }
 
     @Override

providers/netty/src/main/java/com/ning/http/client/providers/netty/util/ChannelBufferUtil.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ning.http.client.providers.netty.util;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+
+public class ChannelBufferUtil {
+
+    public static byte[] channelBuffer2bytes(ChannelBuffer b) {
+        int readable = b.readableBytes();
+        int readerIndex = b.readerIndex();
+        if (b.hasArray()) {
+            byte[] array = b.array();
+            if (b.arrayOffset() == 0 && readerIndex == 0 && array.length == readable) {
+                return array;
+            }
+        }
+        byte[] array = new byte[readable];
+        b.getBytes(readerIndex, array);
+        return array;
+    }
+}