archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Henry Jen 2020-04-14 23:11:49 +00:00
commit 0278846eaa
91 changed files with 1073 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
View file

@ -80,7 +80,6 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private
public $Type$Buffer slice() {
int pos = this.position();
int lim = this.limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
long addr = byteOffset(pos);
return new ByteBufferAs$Type$Buffer$RW$$BO$(bb, -1, 0, rem, rem, addr, segment);

1
src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
View file

@ -213,7 +213,6 @@ class Direct$Type$Buffer$RW$$BO$
public $Type$Buffer slice() {
int pos = this.position();
int lim = this.limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
int off = (pos << $LG_BYTES_PER_VALUE$);
assert (off >= 0);

6
src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
View file

@ -105,13 +105,15 @@ class Heap$Type$Buffer$RW$
}
public $Type$Buffer slice() {
int rem = this.remaining();
int pos = this.position();
int lim = this.limit();
int rem = (pos <= lim ? lim - pos : 0);
return new Heap$Type$Buffer$RW$(hb,
-1,
0,
rem,
rem,
this.position() + offset, segment);
pos + offset, segment);
}
@Override

9
src/java.base/share/classes/java/nio/StringCharBuffer.java
View file

@ -43,12 +43,15 @@ class StringCharBuffer // package-private
}
public CharBuffer slice() {
int pos = this.position();
int lim = this.limit();
int rem = (pos <= lim ? lim - pos : 0);
return new StringCharBuffer(str,
-1,
0,
this.remaining(),
this.remaining(),
offset + this.position());
rem,
rem,
offset + pos);
}
@Override