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 2011/07/28 14:50:18 UTC
svn commit: r1151826 - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/nio/pool/ test/java/org/apache/http/nio/pool/

Author: olegk
Date: Thu Jul 28 12:50:17 2011
New Revision: 1151826

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

Added:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
      - copied, changed from r1151823, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/SessionPool.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
      - copied, changed from r1151821, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestSessionPool.java
Removed:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/SessionPool.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestSessionPool.java

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java (from r1151823, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/SessionPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/SessionPool.java&r1=1151823&r2=1151826&rev=1151826&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/SessionPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java Thu Jul 28 12:50:17 2011
@@ -46,7 +46,7 @@ import org.apache.http.nio.reactor.Sessi
 import org.apache.http.pool.PoolEntry;
 import org.apache.http.pool.PoolStats;
 
-public abstract class SessionPool<T, E extends PoolEntry<T, IOSession>> {
+public abstract class AbstractNIOConnPool<T, E extends PoolEntry<T, IOSession>> {
 
     private final ConnectingIOReactor ioreactor;
     private final SessionRequestCallback sessionRequestCallback;
@@ -62,7 +62,7 @@ public abstract class SessionPool<T, E e
     private volatile int defaultMaxPerRoute;
     private volatile int maxTotal;
 
-    public SessionPool(
+    public AbstractNIOConnPool(
             final ConnectingIOReactor ioreactor,
             int defaultMaxPerRoute,
             int maxTotal) {
@@ -138,7 +138,7 @@ public abstract class SessionPool<T, E e
 
                 @Override
                 protected E createEntry(final T route, final IOSession session) {
-                    return SessionPool.this.createEntry(route, session);
+                    return AbstractNIOConnPool.this.createEntry(route, session);
                 }
 
             };

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java (from r1151821, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestSessionPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestSessionPool.java&r1=1151821&r2=1151826&rev=1151826&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestSessionPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java Thu Jul 28 12:50:17 2011
@@ -42,7 +42,7 @@ import org.apache.http.pool.PoolStats;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-public class TestSessionPool {
+public class TestNIOConnPool {
 
     static class LocalPoolEntry extends PoolEntry<String, IOSession> {
 
@@ -96,7 +96,7 @@ public class TestSessionPool {
 
     }    
 
-    static class LocalSessionPool extends SessionPool<String, LocalPoolEntry> {
+    static class LocalSessionPool extends AbstractNIOConnPool<String, LocalPoolEntry> {
 
         public LocalSessionPool(
                 final ConnectingIOReactor ioreactor, int defaultMaxPerRoute, int maxTotal) {