Merge pull request AsyncHttpClient#105 from cowtowncoder/master

fix to 2 unit test NPEs

Author: cowtowncoder

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

@@ -856,12 +856,6 @@ public <T> ListenableFuture<T> execute(Request request, final AsyncHandler<T> as
         return doConnect(request, asyncHandler, null, true, executeConnectAsync, false);
     }
 
-    /*
-    private <T> void execute(final Request request, final NettyResponseFuture<T> f, boolean useCache, boolean asyncConnect) throws IOException {
-        doConnect(request, f.getAsyncHandler(), f, useCache, asyncConnect, false);
-    }
-    */
-
     private <T> void execute(final Request request, final NettyResponseFuture<T> f, boolean useCache, boolean asyncConnect, boolean reclaimCache) throws IOException {
         doConnect(request, f.getAsyncHandler(), f, useCache, asyncConnect, reclaimCache);
     }

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

@@ -51,6 +51,9 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc
             charset = calculateCharset();
         }
         byte[] b = AsyncHttpProviderUtils.contentToBytes(bodyParts, maxLength);
+        if (charset == null) {
+            charset = DEFAULT_CHARSET;
+        }
         return new String(b, charset);
     }