Merge remote branch 'origin/master'

Author: jloomis

src/main/java/com/ning/http/client/AsyncHttpClient.java

@@ -365,7 +365,7 @@ public void close() {
     protected void finalize() throws Throwable {
         try {
             if (!isClosed.get()) {
-                logger.warn("AsyncHttpClient.close() hasn't been invoked, which may produce file descriptor leaks");
+                logger.debug("AsyncHttpClient.close() hasn't been invoked, which may produce file descriptor leaks");
             }
         } finally {
             super.finalize();

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

@@ -18,6 +18,7 @@
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.RequestFilter;
 import com.ning.http.client.filter.ResponseFilter;
+import com.ning.http.util.ProxyUtils;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -419,6 +420,7 @@ public static class Builder {
         private int maxDefaultRedirects = Integer.getInteger(ASYNC_CLIENT + "defaultMaxRedirects", 5);
         private boolean compressionEnabled = Boolean.getBoolean(ASYNC_CLIENT + "compressionEnabled");
         private String userAgent = System.getProperty(ASYNC_CLIENT + "userAgent", "NING/1.0");
+        private boolean useProxyProperties = Boolean.getBoolean(ASYNC_CLIENT + "useProxyProperties");
         private boolean allowPoolingConnection = true;
         private ScheduledExecutorService reaper = Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors(), new ThreadFactory() {
             public Thread newThread(Runnable r) {
@@ -822,7 +824,21 @@ public Builder setRemoveQueryParamsOnRedirect(boolean removeQueryParamOnRedirect
             this.removeQueryParamOnRedirect = removeQueryParamOnRedirect;
             return this;
         }
-        
+
+        /**
+         * Sets whether AHC should use the default http.proxy* system properties
+         * to obtain proxy information.
+         * <p/>
+         * If useProxyProperties is set to <code>true</code> but {@link #setProxyServer(ProxyServer)} was used 
+         * to explicitly set a proxy server, the latter is preferred.
+         * <p/>
+         * See http://download.oracle.com/javase/1.4.2/docs/guide/net/properties.html
+         */
+        public Builder setUseProxyProperties(boolean useProxyProperties) {
+            this.useProxyProperties = useProxyProperties;
+            return this;
+        }
+
         /**
          * Create a config builder with values taken from the given prototype configuration.
          *
@@ -859,6 +875,10 @@ public Builder(AsyncHttpClientConfig prototype) {
          * @return an {@link AsyncHttpClientConfig}
          */
         public AsyncHttpClientConfig build() {
+            if (proxyServer == null && useProxyProperties) {
+                proxyServer = ProxyUtils.createProxy(System.getProperties());
+            }
+
             return new AsyncHttpClientConfig(defaultMaxTotalConnections,
                     defaultMaxConnectionPerHost,
                     defaultConnectionTimeOutInMs,

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -392,12 +392,20 @@ private void resetMultipartData() {
         request.parts = null;
     }
 
+    private void checkIfBodyAllowed() {
+        if ("GET".equals(request.method) || "HEAD".equals(request.method)) {
+            throw new IllegalArgumentException("Can NOT set Body on HTTP Request Method GET nor HEAD.");
+        }
+    }
+
     public T setBody(File file) {
+        checkIfBodyAllowed();
         request.file = file;
         return derived.cast(this);
     }
 
     public T setBody(byte[] data) throws IllegalArgumentException {
+        checkIfBodyAllowed();
         resetParameters();
         resetNonMultipartData();
         resetMultipartData();
@@ -406,6 +414,7 @@ public T setBody(byte[] data) throws IllegalArgumentException {
     }
 
     public T setBody(String data) throws IllegalArgumentException {
+        checkIfBodyAllowed();
         resetParameters();
         resetNonMultipartData();
         resetMultipartData();
@@ -414,6 +423,7 @@ public T setBody(String data) throws IllegalArgumentException {
     }
 
     public T setBody(InputStream stream) throws IllegalArgumentException {
+        checkIfBodyAllowed();
         resetParameters();
         resetNonMultipartData();
         resetMultipartData();
@@ -426,6 +436,7 @@ public T setBody(EntityWriter dataWriter) {
     }
 
     public T setBody(EntityWriter dataWriter, long length) throws IllegalArgumentException {
+        checkIfBodyAllowed();
         resetParameters();
         resetNonMultipartData();
         resetMultipartData();
@@ -435,6 +446,7 @@ public T setBody(EntityWriter dataWriter, long length) throws IllegalArgumentExc
     }
 
     public T setBody(BodyGenerator bodyGenerator) {
+        checkIfBodyAllowed();
         request.bodyGenerator = bodyGenerator;
         return derived.cast(this);
     }

src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java

@@ -89,7 +89,7 @@ public void calculateAndAddSignature(String baseURL, Request request, RequestBui
         long timestamp = System.currentTimeMillis() / 1000L;
         String signature = calculateSignature(method, baseURL, timestamp, nonce, request.getParams(), request.getQueryParams());
         String headerValue = constructAuthHeader(signature, nonce, timestamp);
-        requestBuilder = requestBuilder.addHeader(HEADER_AUTHORIZATION, headerValue);
+        requestBuilder = requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
     }
 
     /**

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -38,6 +38,7 @@
 import com.ning.http.client.filter.FilterException;
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.ResponseFilter;
+import com.ning.http.client.listener.TransferCompletionHandler;
 import com.ning.http.client.resumable.ResumableAsyncHandler;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.ProxyUtils;
@@ -448,6 +449,10 @@ public T call() {
                     future.setReaperFuture(reaperFuture);
                 }
 
+                if (TransferCompletionHandler.class.isAssignableFrom(asyncHandler.getClass())) {
+                    throw new IllegalStateException(TransferCompletionHandler.class.getName() + "not supported by this provider");
+                }
+
                 int statusCode = 200;
                 try {
                     statusCode = httpClient.executeMethod(method);
@@ -530,7 +535,7 @@ public T call() {
                         if (byteToRead > 0) {
                             int minBytes = Math.min(8192, byteToRead);
                             byte[] bytes = new byte[minBytes];
-                            int leftBytes = minBytes < 8192 ? 0 : byteToRead;
+                            int leftBytes = minBytes < 8192 ? minBytes : byteToRead;
                             int read = 0;
                             while (leftBytes > -1) {
 

src/main/java/com/ning/http/client/providers/apache/ApacheResponseFuture.java

@@ -178,8 +178,11 @@ public V get(long timeout, TimeUnit unit) throws InterruptedException, Execution
             if (!contentProcessed.get() && timeout != -1 && ((System.currentTimeMillis() - touch.get()) <= responseTimeoutInMs)) {
                 return get(timeout, unit);
             }
-            timedOut.set(true);
-            throw new TimeoutException(String.format("No response received after %s", responseTimeoutInMs));
+
+            if (exception.get() == null) {
+                timedOut.set(true);
+                throw new ExecutionException(new TimeoutException(String.format("No response received after %s", responseTimeoutInMs)));
+            }
         } catch (CancellationException ce) {
         }
 

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -34,6 +34,7 @@
 import com.ning.http.client.filter.FilterException;
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.ResponseFilter;
+import com.ning.http.client.listener.TransferCompletionHandler;
 import com.ning.http.multipart.MultipartRequestEntity;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.AuthenticatorUtils;
@@ -248,6 +249,10 @@ public T call() throws Exception {
                 configure(uri, urlConnection, request);
                 urlConnection.connect();
 
+                if (TransferCompletionHandler.class.isAssignableFrom(asyncHandler.getClass())) {
+                    throw new IllegalStateException(TransferCompletionHandler.class.getName() + "not supported by this provider");
+                }
+
                 int statusCode = urlConnection.getResponseCode();
 
                 logger.debug("\n\nRequest {}\n\nResponse {}\n", request, statusCode);
@@ -336,7 +341,7 @@ public T call() throws Exception {
                     if (byteToRead > 0) {
                         int minBytes = Math.min(8192, byteToRead);
                         byte[] bytes = new byte[minBytes];
-                        int leftBytes = minBytes < 8192 ? 0 : byteToRead;
+                        int leftBytes = minBytes < 8192 ? minBytes : byteToRead;
                         int read = 0;
                         while (leftBytes > -1) {
 

src/main/java/com/ning/http/client/providers/jdk/JDKFuture.java

@@ -93,7 +93,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
             super.done();
             return innerFuture.cancel(mayInterruptIfRunning);
         } else {
-            super.done();            
+            super.done();
             return false;
         }
     }
@@ -127,10 +127,13 @@ public V get(long timeout, TimeUnit unit) throws InterruptedException, Execution
             }
         } catch (TimeoutException t) {
             if (!contentProcessed.get() && timeout != -1 && ((System.currentTimeMillis() - touch.get()) <= responseTimeoutInMs)) {
-                return get(timeout,unit);
+                return get(timeout, unit);
+            }
+
+            if (exception.get() == null) {
+                timedOut.set(true);
+                throw new ExecutionException(new TimeoutException(String.format("No response received after %s", responseTimeoutInMs)));
             }
-            timedOut.set(true);
-            throw new TimeoutException(String.format("No response received after %s", responseTimeoutInMs));
         } catch (CancellationException ce) {
         }
 
@@ -145,7 +148,7 @@ public V get(long timeout, TimeUnit unit) throws InterruptedException, Execution
      *
      * @return <code>true</code> if response has expired and should be terminated.
      */
-    public boolean hasExpired(){
+    public boolean hasExpired() {
         return responseTimeoutInMs != -1 && ((System.currentTimeMillis() - touch.get()) > responseTimeoutInMs);
     }