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 2005/12/08 20:35:00 UTC
svn commit: r355179 - in /jakarta/httpcomponents/trunk/http-core/src:
java/org/apache/http/io/ test/org/apache/http/io/
Author: olegk
Date: Thu Dec 8 11:34:47 2005
New Revision: 355179
URL: http://svn.apache.org/viewcvs?rev=355179&view=rev
Log:
Reverted recent changes to the ByteArrayBuffer and CharArrayBuffer classes. Internal buffers made publicly accessible again
Modified:
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java
jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java
jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java?rev=355179&r1=355178&r2=355179&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java Thu Dec 8 11:34:47 2005
@@ -38,8 +38,8 @@
*/
public final class ByteArrayBuffer {
- protected byte[] buffer;
- protected int len;
+ private byte[] buffer;
+ private int len;
public ByteArrayBuffer(int capacity) {
super();
@@ -98,6 +98,10 @@
return this.len;
}
+ public byte[] buffer() {
+ return this.buffer;
+ }
+
public void setLength(int len) {
if (len < 0 || len > this.buffer.length) {
throw new IndexOutOfBoundsException();
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java?rev=355179&r1=355178&r2=355179&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java Thu Dec 8 11:34:47 2005
@@ -40,8 +40,8 @@
*/
public final class CharArrayBuffer {
- protected char[] buffer;
- protected int len;
+ private char[] buffer;
+ private int len;
public CharArrayBuffer(int capacity) {
super();
@@ -149,14 +149,14 @@
if (b == null) {
return;
}
- append(b.buffer, off, len);
+ append(b.buffer(), off, len);
}
public void append(final ByteArrayBuffer b, int off, int len, final String charset) {
if (b == null) {
return;
}
- append(b.buffer, off, len, charset);
+ append(b.buffer(), off, len, charset);
}
public void append(final Object obj) {
@@ -177,6 +177,10 @@
public char charAt(int i) {
return this.buffer[i];
+ }
+
+ public char[] buffer() {
+ return this.buffer;
}
public int capacity() {
Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java?rev=355179&r1=355178&r2=355179&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java Thu Dec 8 11:34:47 2005
@@ -59,6 +59,8 @@
ByteArrayBuffer buffer = new ByteArrayBuffer(16);
assertEquals(16, buffer.capacity());
assertEquals(0, buffer.length());
+ assertNotNull(buffer.buffer());
+ assertEquals(16, buffer.buffer().length);
try {
new ByteArrayBuffer(-1);
fail("IllegalArgumentException should have been thrown");
Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java?rev=355179&r1=355178&r2=355179&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java Thu Dec 8 11:34:47 2005
@@ -59,6 +59,8 @@
CharArrayBuffer buffer = new CharArrayBuffer(16);
assertEquals(16, buffer.capacity());
assertEquals(0, buffer.length());
+ assertNotNull(buffer.buffer());
+ assertEquals(16, buffer.buffer().length);
try {
new CharArrayBuffer(-1);
fail("IllegalArgumentException should have been thrown");