stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6546113: (bf) CharSequence.slice() on wrapped CharSequence doesn't start at buffer position

Browse Source 
Reviewed-by: iris
This commit is contained in:
Roman Kennke 2008-03-13 19:34:49 +00:00 committed by Alan Bateman
parent 66fa5dcf96
commit eab1a9b3df
2 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/share/classes/java/nio/StringCharBuffer.java
View File

@ -60,16 +60,9 @@ class StringCharBuffer // package-private
str = s;
}
private StringCharBuffer(CharSequence s, int mark,
int pos, int limit, int cap)
{
super(mark, pos, limit, cap);
str = s;
}
public CharBuffer duplicate() {
return new StringCharBuffer(str, markValue(),
position(), limit(), capacity());
position(), limit(), capacity(), offset);
}
public CharBuffer asReadOnlyBuffer() {
@ -77,11 +70,11 @@ class StringCharBuffer // package-private
}
public final char get() {
return str.charAt(nextGetIndex());
return str.charAt(nextGetIndex() + offset);
}
public final char get(int index) {
return str.charAt(checkIndex(index));
return str.charAt(checkIndex(index) + offset);
}
// ## Override bulk get methods for better performance
@ -103,15 +96,16 @@ class StringCharBuffer // package-private
}
final String toString(int start, int end) {
return str.toString().substring(start, end);
return str.toString().substring(start + offset, end + offset);
}
public final CharSequence subSequence(int start, int end) {
try {
int pos = position();
return new StringCharBuffer(str,
return new StringCharBuffer(str, -1,
pos + checkIndex(start, pos),
pos + checkIndex(end, pos));
pos + checkIndex(end, pos),
remaining(), offset);
} catch (IllegalArgumentException x) {
throw new IndexOutOfBoundsException();
}

51
jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java
View File

@ -53,6 +53,57 @@ public class StringCharBufferSliceTest {
buff = CharBuffer.wrap(in, 3, in.length());
test(buff, buff.slice());
System.out.println(
">>> StringCharBufferSliceTest-main: testing slice result with get()");
buff.position(4);
buff.limit(7);
CharBuffer slice = buff.slice();
for (int i = 0; i < 3; i++) {
if (slice.get() != buff.get()) {
throw new RuntimeException("Wrong characters in slice result.");
}
}
System.out.println(
">>> StringCharBufferSliceTest-main: testing slice result with get(int)");
buff.position(4);
buff.limit(7);
slice = buff.slice();
for (int i = 0; i < 3; i++) {
if (slice.get(i) != buff.get(4 + i)) {
throw new RuntimeException("Wrong characters in slice result.");
}
}
System.out.println(
">>> StringCharBufferSliceTest-main: testing toString.");
buff.position(4);
buff.limit(7);
slice = buff.slice();
if (! slice.toString().equals("tes")) {
throw new RuntimeException("bad toString() after slice(): " + slice.toString());
}
System.out.println(
">>> StringCharBufferSliceTest-main: testing subSequence.");
buff.position(4);
buff.limit(8);
slice = buff.slice();
CharSequence subSeq = slice.subSequence(1, 3);
if (subSeq.charAt(0) != 'e' || subSeq.charAt(1) != 's') {
throw new RuntimeException("bad subSequence() after slice(): '" + subSeq + "'");
}
System.out.println(
">>> StringCharBufferSliceTest-main: testing duplicate.");
buff.position(4);
buff.limit(8);
slice = buff.slice();
CharBuffer dupe = slice.duplicate();
if (dupe.charAt(0) != 't' || dupe.charAt(1) != 'e'
|| dupe.charAt(2) != 's' || dupe.charAt(3) != 't') {
throw new RuntimeException("bad duplicate() after slice(): '" + dupe + "'");
}
System.out.println(">>> StringCharBufferSliceTest-main: done!");
}