svn commit: r649220 - in /httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm: Aborter.java ConnPoolByRoute.java WaitingThreadAborter.java

[ol...@apache.org]

Author: olegk
Date: Thu Apr 17 11:40:24 2008
New Revision: 649220

URL: http://svn.apache.org/viewvc?rev=649220&view=rev
Log:
Renamed Aborter to WaitingThreadAborter

Added:
    httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
      - copied, changed from r638979, httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/Aborter.java
Removed:
    httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/Aborter.java
Modified:
    httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java

Modified: httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=649220&r1=649219&r2=649220&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Thu Apr 17 11:40:24 2008
@@ -221,7 +221,7 @@
             final HttpRoute route,
             final Object state) {
         
-        final Aborter aborter = new Aborter();
+        final WaitingThreadAborter aborter = new WaitingThreadAborter();
         
         return new PoolEntryRequest() {
         
@@ -246,7 +246,7 @@
 
     /**
      * Obtains a pool entry with a connection within the given timeout.
-     * If a {@link WaitingThread} is used to block, {@link Aborter#setWaitingThread(WaitingThread)}
+     * If a {@link WaitingThread} is used to block, {@link WaitingThreadAborter#setWaitingThread(WaitingThread)}
      * must be called before blocking, to allow the thread to be interrupted.
      *
      * @param route     the route for which to get the connection
@@ -267,7 +267,7 @@
     protected BasicPoolEntry getEntryBlocking(
                                    HttpRoute route, Object state,
                                    long timeout, TimeUnit tunit,
-                                   Aborter aborter)
+                                   WaitingThreadAborter aborter)
         throws ConnectionPoolTimeoutException, InterruptedException {
 
         Date deadline = null;

Copied: httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java (from r638979, httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/Aborter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java?p2=httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java&p1=httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/Aborter.java&r1=638979&r2=649220&rev=649220&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/Aborter.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java Thu Apr 17 11:40:24 2008
@@ -1,7 +1,7 @@
 /*
- * $HeadURL:$
- * $Revision:$
- * $Date:$
+ * $HeadURL$
+ * $Revision$
+ * $Date$
  *
  * ====================================================================
  *
@@ -31,7 +31,7 @@
 package org.apache.http.impl.conn.tsccm;
 
 /** A simple class that can interrupt a {@link WaitingThread}. */
-public class Aborter {
+public class WaitingThreadAborter {
     
     private WaitingThread waitingThread;
     private boolean aborted;