svn commit: r797253 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java

[se...@apache.org]

Author: sebb
Date: Thu Jul 23 22:43:04 2009
New Revision: 797253

URL: http://svn.apache.org/viewvc?rev=797253&view=rev
Log:
Annotate how non-final fields are made thread-safe

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=797253&r1=797252&r2=797253&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java Thu Jul 23 22:43:04 2009
@@ -32,6 +32,7 @@
 import java.lang.reflect.UndeclaredThrowableException;
 
 import net.jcip.annotations.ThreadSafe;
+import net.jcip.annotations.GuardedBy;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -158,51 +159,67 @@
     private final Log log = LogFactory.getLog(getClass());
 
     /** The parameters. */
+    @GuardedBy("this")
     private HttpParams defaultParams;
 
     /** The request executor. */
+    @GuardedBy("this")
     private HttpRequestExecutor requestExec;
 
     /** The connection manager. */
+    @GuardedBy("this")
     private ClientConnectionManager connManager;
 
     /** The connection re-use strategy. */
+    @GuardedBy("this")
     private ConnectionReuseStrategy reuseStrategy;
     
     /** The connection keep-alive strategy. */
+    @GuardedBy("this")
     private ConnectionKeepAliveStrategy keepAliveStrategy;
 
     /** The cookie spec registry. */
+    @GuardedBy("this")
     private CookieSpecRegistry supportedCookieSpecs;
 
     /** The authentication scheme registry. */
+    @GuardedBy("this")
     private AuthSchemeRegistry supportedAuthSchemes;
     
     /** The HTTP processor. */
+    @GuardedBy("this")
     private BasicHttpProcessor httpProcessor;
 
     /** The request retry handler. */
+    @GuardedBy("this")
     private HttpRequestRetryHandler retryHandler;
 
     /** The redirect handler. */
+    @GuardedBy("this")
     private RedirectHandler redirectHandler;
 
     /** The target authentication handler. */
+    @GuardedBy("this")
     private AuthenticationHandler targetAuthHandler;
 
     /** The proxy authentication handler. */
+    @GuardedBy("this")
     private AuthenticationHandler proxyAuthHandler;
 
     /** The cookie store. */
+    @GuardedBy("this")
     private CookieStore cookieStore;
 
     /** The credentials provider. */
+    @GuardedBy("this")
     private CredentialsProvider credsProvider;
     
     /** The route planner. */
+    @GuardedBy("this")
     private HttpRoutePlanner routePlanner;
 
     /** The user token handler. */
+    @GuardedBy("this")
     private UserTokenHandler userTokenHandler;