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/24 23:22:17 UTC
svn commit: r1545090 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
Author: sebb
Date: Sun Nov 24 22:22:16 2013
New Revision: 1545090
URL: http://svn.apache.org/r1545090
Log:
Rename local variable to avoid clash with field
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java?rev=1545090&r1=1545089&r2=1545090&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java Sun Nov 24 22:22:16 2013
@@ -112,11 +112,11 @@ public class BufferingNHttpEntity extend
public void writeTo(final OutputStream outstream) throws IOException {
Args.notNull(outstream, "Output stream");
final InputStream instream = getContent();
- final byte[] buffer = new byte[BUFFER_SIZE];
+ final byte[] buff = new byte[BUFFER_SIZE];
int l;
// consume until EOF
- while ((l = instream.read(buffer)) != -1) {
- outstream.write(buffer, 0, l);
+ while ((l = instream.read(buff)) != -1) {
+ outstream.write(buff, 0, l);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java?rev=1545090&r1=1545089&r2=1545090&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java Sun Nov 24 22:22:16 2013
@@ -283,8 +283,8 @@ public class ChunkedInputStream extends
try {
if (!eof) {
// read and discard the remainder of the message
- final byte buffer[] = new byte[BUFFER_SIZE];
- while (read(buffer) >= 0) {
+ final byte buff[] = new byte[BUFFER_SIZE];
+ while (read(buff) >= 0) {
}
}
} finally {