hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1039059 - in /httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client: BasicAsyncHttpClient.java ConnState.java HttpAsyncExchange.java HttpExchangeImpl.java NHttpClientProtocolHandler.java
Date Thu, 25 Nov 2010 14:24:31 GMT
Author: olegk
Date: Thu Nov 25 14:24:31 2010
New Revision: 1039059

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

Added:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java
      - copied, changed from r1039053, httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpExchangeImpl.java
Removed:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpExchangeImpl.java
Modified:
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java
    httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/ConnState.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/BasicAsyncHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java?rev=1039059&r1=1039058&r2=1039059&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java
Thu Nov 25 14:24:31 2010
@@ -171,7 +171,7 @@ public class BasicAsyncHttpClient implem
     public <T> Future<T> execute(
             final HttpAsyncExchangeHandler<T> handler, final FutureCallback<T>
callback) {
         HttpRoute route = new HttpRoute(handler.getTarget());
-        HttpExchangeImpl<T> httpexchange = new HttpExchangeImpl<T>(
+        HttpAsyncExchange<T> httpexchange = new HttpAsyncExchange<T>(
                 route, null, this.sessmrg, handler, callback);
         return httpexchange.getResultFuture();
     }

Modified: httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/ConnState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/ConnState.java?rev=1039059&r1=1039058&r2=1039059&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/ConnState.java
(original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/ConnState.java
Thu Nov 25 14:24:31 2010
@@ -35,7 +35,7 @@ class ConnState {
     private MessageState responseState;
     private HttpRequest request;
     private HttpResponse response;
-    private HttpExchangeImpl<?> httpexchange;
+    private HttpAsyncExchange<?> httpexchange;
     private boolean valid;
     private int timeout;
 
@@ -78,11 +78,11 @@ class ConnState {
         this.response = response;
     }
 
-    public void setHttpExchange(final HttpExchangeImpl<?> httpexchange) {
+    public void setHttpExchange(final HttpAsyncExchange<?> httpexchange) {
         this.httpexchange = httpexchange;
     }
 
-    public HttpExchangeImpl<?> getHttpExchange() {
+    public HttpAsyncExchange<?> getHttpExchange() {
         return this.httpexchange;
     }
 

Copied: httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java
(from r1039053, httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpExchangeImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java?p2=httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java&p1=httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpExchangeImpl.java&r1=1039053&r2=1039059&rev=1039059&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpExchangeImpl.java
(original)
+++ httpcomponents/httpasyncclient/trunk/src/main/java/org/apache/http/impl/nio/client/HttpAsyncExchange.java
Thu Nov 25 14:24:31 2010
@@ -37,7 +37,7 @@ import org.apache.http.nio.conn.IOSessio
 import org.apache.http.nio.conn.ManagedIOSession;
 import org.apache.http.nio.reactor.IOSession;
 
-class HttpExchangeImpl<T> {
+class HttpAsyncExchange<T> {
 
     public static final String HTTP_EXCHANGE = "http.nio.http-exchange";
 
@@ -47,7 +47,7 @@ class HttpExchangeImpl<T> {
 
     private ManagedIOSession managedSession;
 
-    public HttpExchangeImpl(
+    public HttpAsyncExchange(
             final HttpRoute route,
             final Object state,
             final IOSessionManager<HttpRoute> sessmrg,

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=1039059&r1=1039058&r2=1039059&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
Thu Nov 25 14:24:31 2010
@@ -128,7 +128,7 @@ class NHttpClientProtocolHandler impleme
         }
         if (connState != null) {
             connState.reset();
-            HttpExchangeImpl<?> httpexchange = connState.getHttpExchange();
+            HttpAsyncExchange<?> httpexchange = connState.getHttpExchange();
             if (httpexchange != null) {
                 httpexchange.shutdown();
             }
@@ -140,7 +140,7 @@ class NHttpClientProtocolHandler impleme
         ConnState connState = getConnState(context);
         this.log.error("HTTP protocol exception: " + ex.getMessage(), ex);
         if (connState != null) {
-            HttpExchangeImpl<?> httpexchange = connState.getHttpExchange();
+            HttpAsyncExchange<?> httpexchange = connState.getHttpExchange();
             if (httpexchange != null) {
                 httpexchange.failed(ex);
             }
@@ -153,7 +153,7 @@ class NHttpClientProtocolHandler impleme
         ConnState connState = getConnState(context);
         this.log.error("I/O error: " + ex.getMessage(), ex);
         if (connState != null) {
-            HttpExchangeImpl<?> httpexchange = connState.getHttpExchange();
+            HttpAsyncExchange<?> httpexchange = connState.getHttpExchange();
             if (httpexchange != null) {
                 httpexchange.failed(ex);
             }
@@ -164,7 +164,7 @@ class NHttpClientProtocolHandler impleme
     public void requestReady(final NHttpClientConnection conn) {
         HttpContext context = conn.getContext();
         ConnState connState = getConnState(context);
-        HttpExchangeImpl<?> httpexchange = getHttpExchange(context);
+        HttpAsyncExchange<?> httpexchange = getHttpExchange(context);
         if (this.log.isDebugEnabled()) {
             this.log.debug("Request ready " + formatState(conn, connState));
         }
@@ -352,8 +352,8 @@ class NHttpClientProtocolHandler impleme
         return (ConnState) context.getAttribute(CONN_STATE);
     }
 
-    private HttpExchangeImpl<?> getHttpExchange(final HttpContext context) {
-        return (HttpExchangeImpl<?>) context.getAttribute(HttpExchangeImpl.HTTP_EXCHANGE);
+    private HttpAsyncExchange<?> getHttpExchange(final HttpContext context) {
+        return (HttpAsyncExchange<?>) context.getAttribute(HttpAsyncExchange.HTTP_EXCHANGE);
     }
 
     private void continueRequest(
@@ -376,7 +376,7 @@ class NHttpClientProtocolHandler impleme
     private void processResponse(
             final NHttpClientConnection conn,
             final ConnState connState) throws IOException {
-        HttpExchangeImpl<?> httpexchange = connState.getHttpExchange();
+        HttpAsyncExchange<?> httpexchange = connState.getHttpExchange();
         if (!connState.isValid()) {
             conn.close();
         }



Mime
View raw message