You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/04/26 11:37:27 UTC

svn commit: r1330733 - /httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java

Author: olegk
Date: Thu Apr 26 09:37:27 2012
New Revision: 1330733

URL: http://svn.apache.org/viewvc?rev=1330733&view=rev
Log:
HTTPCLIENT-1186: State of newly created connections in the connection pool is not always correctly updated potentially allowing those connections to be leased to users with a different security context

Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?rev=1330733&r1=1330732&r2=1330733&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Thu Apr 26 09:37:27 2012
@@ -338,10 +338,12 @@ class DefaultAsyncRequestDirector<T> imp
             }
 
             Object userToken = this.localContext.getAttribute(ClientContext.USER_TOKEN);
-            if (managedConn != null && userToken == null) {
-                userToken = userTokenHandler.getUserToken(this.localContext);
-                if (userToken != null) {
+            if (managedConn != null) {
+                if (userToken == null) {
+                    userToken = userTokenHandler.getUserToken(this.localContext);
                     this.localContext.setAttribute(ClientContext.USER_TOKEN, userToken);
+                }
+                if (userToken != null) {
                     managedConn.setState(userToken);
                 }
             }