Merge pull request AsyncHttpClient#504 from haed/master

OAuth signature calculator with userAuth#key check

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/date/RFC2616DateParser.java

@@ -83,7 +83,7 @@ private Tokens tokenize() {
         }
 
         // finish lastToken
-        if (inToken = true)
+        if (inToken == true)
             ends[tokenCount++] = end;
 
         return new Tokens(starts, ends, tokenCount);

api/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java

@@ -126,7 +126,9 @@ public String calculateSignature(String method, String baseURL, long oauthTimest
         allParameters.add(KEY_OAUTH_NONCE, nonce);
         allParameters.add(KEY_OAUTH_SIGNATURE_METHOD, OAUTH_SIGNATURE_METHOD);
         allParameters.add(KEY_OAUTH_TIMESTAMP, String.valueOf(oauthTimestamp));
-        allParameters.add(KEY_OAUTH_TOKEN, userAuth.getKey());
+        if (userAuth.getKey() != null) {
+            allParameters.add(KEY_OAUTH_TOKEN, userAuth.getKey());
+        }
         allParameters.add(KEY_OAUTH_VERSION, OAUTH_VERSION_1_0);
 
         if (formParams != null) {
@@ -164,7 +166,9 @@ public String constructAuthHeader(String signature, String nonce, long oauthTime
         StringBuilder sb = new StringBuilder(200);
         sb.append("OAuth ");
         sb.append(KEY_OAUTH_CONSUMER_KEY).append("=\"").append(consumerAuth.getKey()).append("\", ");
-        sb.append(KEY_OAUTH_TOKEN).append("=\"").append(userAuth.getKey()).append("\", ");
+        if (userAuth.getKey() != null) {
+            sb.append(KEY_OAUTH_TOKEN).append("=\"").append(userAuth.getKey()).append("\", ");
+        }
         sb.append(KEY_OAUTH_SIGNATURE_METHOD).append("=\"").append(OAUTH_SIGNATURE_METHOD).append("\", ");
 
         // careful: base64 has chars that need URL encoding:

api/src/main/java/org/asynchttpclient/util/ProxyUtils.java

@@ -207,6 +207,7 @@ public ProxyServer select(URI uri) {
                         case HTTP:
                             if (!(proxy.address() instanceof InetSocketAddress)) {
                                 log.warn("Don't know how to connect to address " + proxy.address());
+                                return null;
                             } else {
                                 InetSocketAddress address = (InetSocketAddress) proxy.address();
                                 return new ProxyServer(Protocol.HTTP, address.getHostName(), address.getPort());