More consistent debug logs; added annotations

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.0.x@950681 13f79535-47bb-0310-9956-ffa450edef68
mojia · Jun 2, 2010 · bb1a0db · bb1a0db
1 parent a2d5080
commit bb1a0db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java b/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
@@ -31,6 +31,7 @@
 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 @@
  *
  * @since 4.0
  */
+@NotThreadSafe
 public abstract class AbstractPoolEntry {
 
     /** The connection operator. */

diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java b/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
@@ -28,6 +28,7 @@
 
 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 @@
  *
  * @since 4.0
  */
+@NotThreadSafe
 public class BasicPoolEntry extends AbstractPoolEntry {
 
     /**

diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java b/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
@@ -278,9 +278,9 @@ protected BasicPoolEntry getEntryBlocking(
                 }
 
                 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: