[1.9.x] + fix issue AsyncHttpClient#959

"Grizzly: 401 response lost when no WWW-Authenticate header is present"

Author: oleksiys

src/main/java/com/ning/http/client/providers/grizzly/AhcEventFilter.java

@@ -490,17 +490,10 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                 final FilterChainContext ctx) {
             final List<String> authHeaders = listOf(responsePacket.getHeaders()
                     .values(Header.WWWAuthenticate));
-            
-            if (authHeaders.isEmpty()) {
-                throw new IllegalStateException("401 response received, but no WWW-Authenticate header was present");
-            }
-            
-            final GrizzlyAsyncHttpProvider provider =
-                    httpTransactionContext.provider;
-                        
+
             Realm realm = getRealm(httpTransactionContext);
 
-            if (realm == null) {
+            if (authHeaders.isEmpty() || realm == null) {
                 httpTransactionContext.invocationStatus = InvocationStatus.STOP;
                 final AsyncHandler ah = httpTransactionContext.getAsyncHandler();
 
@@ -515,6 +508,8 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                 return true;
             }
 
+            final GrizzlyAsyncHttpProvider provider =
+                    httpTransactionContext.provider;
             final Request req = httpTransactionContext.getAhcRequest();
 
             try {
@@ -605,17 +600,9 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                     listOf(responsePacket.getHeaders()
                             .values(Header.ProxyAuthenticate));
 
-            if (proxyAuthHeaders.isEmpty()) {
-                throw new IllegalStateException("407 response received, but no "
-                        + "Proxy-Authenticate header was present");
-            }
-            
-            final GrizzlyAsyncHttpProvider provider =
-                    httpTransactionContext.provider;
-                        
             final ProxyServer proxyServer = httpTransactionContext.getProxyServer();
 
-            if (proxyServer == null) {
+            if (proxyAuthHeaders.isEmpty() || proxyServer == null) {
                 httpTransactionContext.invocationStatus = InvocationStatus.STOP;
                 final AsyncHandler ah = httpTransactionContext.getAsyncHandler();
 
@@ -630,6 +617,9 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                 return true;
             }
 
+            final GrizzlyAsyncHttpProvider provider =
+                    httpTransactionContext.provider;
+                        
             final Request req = httpTransactionContext.getAhcRequest();
 
             try {

src/test/java/com/ning/http/client/async/grizzly/GrizzlyUnexpectingTimeoutTest.java renamed to src/test/java/com/ning/http/client/async/grizzly/GrizzlyExpectingTimeoutTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2012-2015 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -35,16 +35,16 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-public class GrizzlyUnexpectingTimeoutTest extends AbstractBasicTest {
+public class GrizzlyExpectingTimeoutTest extends AbstractBasicTest {
 
     private static final String MSG = "Unauthorized without WWW-Authenticate header";
 
     protected String getExpectedTimeoutMessage() {
-        return "401 response received, but no WWW-Authenticate header was present";
+        return "Timeout exceeded";
     }
 
     @Override
@@ -80,7 +80,7 @@ public void run() {
     }
 
     @Test(groups = {"standalone", "default_provider"})
-    public void unexpectedTimeoutTest() throws IOException {
+    public void expectedTimeoutTest() throws IOException {
         final AtomicInteger counts = new AtomicInteger();
         final int timeout = 100;
 
@@ -107,7 +107,7 @@ public void onThrowable(Throwable t) {
             } catch (InterruptedException e) {
                 fail("Interrupted.", e);
             } catch (ExecutionException e) {
-                assertFalse(e.getCause() instanceof TimeoutException);
+                assertTrue(e.getCause() instanceof TimeoutException);
                 assertEquals(e.getCause().getMessage(), getExpectedTimeoutMessage());
             }
             // wait for timeout again.