You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2010/12/01 13:49:24 UTC
svn commit: r1040984 - in /httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client: BasicHttpAsyncClient.java DefaultAsyncRequestDirector.java HttpAsyncExchange.java NHttpClientProtocolHandler.java

Author: olegk
Date: Wed Dec  1 12:49:23 2010
New Revision: 1040984

URL: http://svn.apache.org/viewvc?rev=1040984&view=rev
Log:
Renamed class

Added:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
      - copied, changed from r1040983, httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java
Removed:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java
Modified:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/NHttpClientProtocolHandler.java

Modified: httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java?rev=1040984&r1=1040983&r2=1040984&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java Wed Dec  1 12:49:23 2010
@@ -169,7 +169,7 @@ public class BasicHttpAsyncClient implem
 
     public <T> Future<T> execute(
             final HttpAsyncExchangeHandler<T> handler, final FutureCallback<T> callback) {
-        HttpAsyncExchange<T> httpexchange = new HttpAsyncExchange<T>(
+        DefaultAsyncRequestDirector<T> httpexchange = new DefaultAsyncRequestDirector<T>(
                 handler,
                 callback,
                 this.sessmrg,

Copied: httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (from r1040983, httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?p2=httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java&p1=httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java&r1=1040983&r2=1040984&rev=1040984&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java (original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Wed Dec  1 12:49:23 2010
@@ -50,9 +50,9 @@ import org.apache.http.protocol.Executio
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
 
-class HttpAsyncExchange<T> implements HttpAsyncExchangeHandler<T> {
+class DefaultAsyncRequestDirector<T> implements HttpAsyncExchangeHandler<T> {
 
-    public static final String HTTP_EXCHANGE = "http.nio.http-exchange";
+    public static final String HTTP_EXCHANGE_HANDLER = "http.nio.async-exchange-handler";
 
     private final IOSessionManager<HttpRoute> sessmrg;
     private final HttpProcessor httppocessor;
@@ -64,7 +64,7 @@ class HttpAsyncExchange<T> implements Ht
     private Future<ManagedIOSession> sessionFuture;
     private ManagedIOSession managedSession;
 
-    public HttpAsyncExchange(
+    public DefaultAsyncRequestDirector(
             final HttpAsyncExchangeHandler<T> handler,
             final FutureCallback<T> callback,
             final IOSessionManager<HttpRoute> sessmrg,
@@ -173,7 +173,7 @@ class HttpAsyncExchange<T> implements Ht
     private synchronized void sessionRequestCompleted(final ManagedIOSession session) {
         this.managedSession = session;
         IOSession iosession = session.getSession();
-        iosession.setAttribute(HTTP_EXCHANGE, this);
+        iosession.setAttribute(HTTP_EXCHANGE_HANDLER, this);
         iosession.setEvent(SelectionKey.OP_WRITE);
     }
 

Modified: httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/NHttpClientProtocolHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/NHttpClientProtocolHandler.java?rev=1040984&r1=1040983&r2=1040984&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/NHttpClientProtocolHandler.java (original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/NHttpClientProtocolHandler.java Wed Dec  1 12:49:23 2010
@@ -319,7 +319,7 @@ class NHttpClientProtocolHandler impleme
     }
 
     private HttpAsyncExchangeHandler<?> getHandler(final HttpContext context) {
-        return (HttpAsyncExchangeHandler<?>) context.getAttribute(HttpAsyncExchange.HTTP_EXCHANGE);
+        return (HttpAsyncExchangeHandler<?>) context.getAttribute(DefaultAsyncRequestDirector.HTTP_EXCHANGE_HANDLER);
     }
 
     private void continueRequest(