svn commit: r573832 - in /jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm: BasicPooledConnAdapter.java TSCCMConnAdapter.java ThreadSafeClientConnManager.java package.html

[ro...@apache.org]

Author: rolandw
Date: Sat Sep  8 06:05:02 2007
New Revision: 573832

URL: http://svn.apache.org/viewvc?rev=573832&view=rev
Log:
renamed TSCCMConnAdapter

Added:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
      - copied, changed from r573828, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/TSCCMConnAdapter.java
Removed:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/TSCCMConnAdapter.java
Modified:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/package.html

Copied: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java (from r573828, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/TSCCMConnAdapter.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java?p2=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java&p1=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/TSCCMConnAdapter.java&r1=573828&r2=573832&rev=573832&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/TSCCMConnAdapter.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java Sat Sep  8 06:05:02 2007
@@ -42,7 +42,7 @@
  * All connections given out by the manager are wrappers which
  * can be {@link #detach detach}ed to prevent further use on release.
  */
-public class TSCCMConnAdapter extends AbstractPooledConnAdapter {
+public class BasicPooledConnAdapter extends AbstractPooledConnAdapter {
 
     /**
      * Creates a new adapter.
@@ -50,7 +50,7 @@
      * @param tsccm   the connection manager
      * @param entry   the pool entry for the connection being wrapped
      */
-    protected TSCCMConnAdapter(ThreadSafeClientConnManager tsccm,
+    protected BasicPooledConnAdapter(ThreadSafeClientConnManager tsccm,
                                AbstractPoolEntry entry) {
         super(tsccm, entry);
         super.markedReusable = true;

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=573832&r1=573831&r2=573832&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java Sat Sep  8 06:05:02 2007
@@ -176,19 +176,19 @@
         final BasicPoolEntry entry =
             connectionPool.getEntry(route, timeout, connOperator);
 
-        return new TSCCMConnAdapter(this, entry);
+        return new BasicPooledConnAdapter(this, entry);
     }
 
     
     // non-javadoc, see interface ClientConnectionManager
     public void releaseConnection(ManagedClientConnection conn) {
 
-        if (!(conn instanceof TSCCMConnAdapter)) {
+        if (!(conn instanceof BasicPooledConnAdapter)) {
             throw new IllegalArgumentException
                 ("Connection class mismatch, " +
                  "connection not obtained from this manager.");
         }
-        TSCCMConnAdapter hca = (TSCCMConnAdapter) conn;
+        BasicPooledConnAdapter hca = (BasicPooledConnAdapter) conn;
         if ((hca.getPoolEntry() != null) && (hca.getManager() != this)) {
             throw new IllegalArgumentException
                 ("Connection not obtained from this manager.");

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/package.html
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/package.html?rev=573832&r1=573831&r2=573832&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/package.html (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/package.html Sat Sep  8 06:05:02 2007
@@ -81,7 +81,7 @@
 
 <tr>
 <td style="text-align: center; background-color: #00ff00;">
-{@link org.apache.http.impl.conn.tsccm.TSCCMConnAdapter}
+{@link org.apache.http.impl.conn.tsccm.BasicPooledConnAdapter}
 </td>
 <td style="text-align: center; background-color: #ffff00;">
 {@link org.apache.http.impl.conn.tsccm.ConnPoolByRoute}