svn commit: r950681 - in /httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn: AbstractPoolEntry.java tsccm/BasicPoolEntry.java tsccm/ConnPoolByRoute.java

[ol...@apache.org]

Author: olegk
Date: Wed Jun  2 17:34:28 2010
New Revision: 950681

URL: http://svn.apache.org/viewvc?rev=950681&view=rev
Log:
More consistent debug logs; added annotations

Modified:
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java?rev=950681&r1=950680&r2=950681&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java (original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java Wed Jun  2 17:34:28 2010
@@ -31,6 +31,7 @@ import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
+import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.routing.RouteTracker;
 import org.apache.http.conn.ClientConnectionOperator;
@@ -52,6 +53,7 @@ import org.apache.http.conn.OperatedClie
  *
  * @since 4.0
  */
+@NotThreadSafe
 public abstract class AbstractPoolEntry {
 
     /** The connection operator. */

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java?rev=950681&r1=950680&r2=950681&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java (original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java Wed Jun  2 17:34:28 2010
@@ -28,6 +28,7 @@ package org.apache.http.impl.conn.tsccm;
 
 import java.lang.ref.ReferenceQueue;
 
+import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.conn.OperatedClientConnection;
 import org.apache.http.conn.ClientConnectionOperator;
 import org.apache.http.conn.routing.HttpRoute;
@@ -38,6 +39,7 @@ import org.apache.http.impl.conn.Abstrac
  *
  * @since 4.0
  */
+@NotThreadSafe
 public class BasicPoolEntry extends AbstractPoolEntry {
 
     /**

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=950681&r1=950680&r2=950681&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Wed Jun  2 17:34:28 2010
@@ -278,9 +278,9 @@ public class ConnPoolByRoute extends Abs
                 }
 
                 if (log.isDebugEnabled()) {
-                    log.debug("Total connections kept alive: " + freeConnections.size()); 
-                    log.debug("Total issued connections: " + leasedConnections.size()); 
-                    log.debug("Total allocated connection: " + numConnections + " out of " + maxTotalConnections);
+                    log.debug("[" + route + "] kept alive: " + freeConnections.size() + 
+                            ", issued: " + leasedConnections.size() + 
+                            ", allocated: " + numConnections + " out of " + maxTotalConnections);
                 }
                 
                 // the cases to check for: