You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2013/11/25 03:10:59 UTC
svn commit: r1545135 - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/impl/nio/reactor/ test/java/org/apache/http/impl/nio/

Author: sebb
Date: Mon Nov 25 02:10:58 2013
New Revision: 1545135

URL: http://svn.apache.org/r1545135
Log:
Rename variables to avoid name hiding

Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java?rev=1545135&r1=1545134&r2=1545135&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java Mon Nov 25 02:10:58 2013
@@ -327,10 +327,10 @@ public class SessionInputBufferImpl exte
     }
 
     public String readLine(final boolean endOfStream) throws CharacterCodingException {
-        final CharArrayBuffer charbuffer = new CharArrayBuffer(64);
-        final boolean found = readLine(charbuffer, endOfStream);
+        final CharArrayBuffer buffer = new CharArrayBuffer(64);
+        final boolean found = readLine(buffer, endOfStream);
         if (found) {
-            return charbuffer.toString();
+            return buffer.toString();
         } else {
             return null;
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java?rev=1545135&r1=1545134&r2=1545135&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java Mon Nov 25 02:10:58 2013
@@ -69,7 +69,7 @@ public class TestDefaultNHttpClientConne
     @Mock
     private IOSession session;
     @Mock
-    private ByteChannel channel;
+    private ByteChannel byteChan;
     @Mock
     private NHttpClientEventHandler handler;
 
@@ -97,7 +97,7 @@ public class TestDefaultNHttpClientConne
         final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         request.setEntity(new StringEntity("stuff"));
 
-        Mockito.when(session.channel()).thenReturn(channel);
+        Mockito.when(session.channel()).thenReturn(byteChan);
 
         Assert.assertEquals(0, conn.getMetrics().getRequestCount());
         conn.submitRequest(request);
@@ -116,7 +116,7 @@ public class TestDefaultNHttpClientConne
         final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         request.setEntity(new StringEntity("stuff"));
 
-        Mockito.when(session.channel()).thenReturn(channel);
+        Mockito.when(session.channel()).thenReturn(byteChan);
 
         conn.submitRequest(request);
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java?rev=1545135&r1=1545134&r2=1545135&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java Mon Nov 25 02:10:58 2013
@@ -69,7 +69,7 @@ public class TestDefaultNHttpServerConne
     @Mock
     private IOSession session;
     @Mock
-    private ByteChannel channel;
+    private ByteChannel byteChan;
     @Mock
     private NHttpServerEventHandler handler;
 
@@ -97,7 +97,7 @@ public class TestDefaultNHttpServerConne
         final BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
         response.setEntity(new StringEntity("stuff"));
 
-        Mockito.when(session.channel()).thenReturn(channel);
+        Mockito.when(session.channel()).thenReturn(byteChan);
 
         Assert.assertEquals(0, conn.getMetrics().getResponseCount());
         conn.submitResponse(response);
@@ -116,7 +116,7 @@ public class TestDefaultNHttpServerConne
         final BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
         response.setEntity(new StringEntity("stuff"));
 
-        Mockito.when(session.channel()).thenReturn(channel);
+        Mockito.when(session.channel()).thenReturn(byteChan);
 
         conn.submitResponse(response);