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:
Jesper Wilhelmsson 2021-01-23 03:15:43 +00:00
commit 6f2a394314
11 changed files with 127 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/java/nio/Buffer.java
View file

@ -313,8 +313,8 @@ public abstract class Buffer {
public Buffer position(int newPosition) {
if (newPosition > limit | newPosition < 0)
throw createPositionException(newPosition);
if (mark > newPosition) mark = -1;
position = newPosition;
if (mark > position) mark = -1;
return this;
}
@ -503,7 +503,8 @@ public abstract class Buffer {
* @return The number of elements remaining in this buffer
*/
public final int remaining() {
return limit - position;
int rem = limit - position;
return rem > 0 ? rem : 0;
}
/**

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

@ -292,7 +292,9 @@ class Heap$Type$Buffer$RW$
public $Type$Buffer compact() {
#if[rw]
int pos = position();
int rem = limit() - pos;
int lim = limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
System.arraycopy(hb, ix(pos), hb, ix(0), rem);
position(rem);
limit(capacity());

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

@ -452,15 +452,23 @@ public abstract class $Type$Buffer
*/
public int read(CharBuffer target) throws IOException {
// Determine the number of bytes n that can be transferred
int targetRemaining = target.remaining();
int limit = limit();
int remaining = limit - position();
if (remaining == 0)
int pos = position();
int remaining = limit - pos;
assert remaining >= 0;
if (remaining <= 0) // include equality condition when remaining == 0
return -1;
int targetRemaining = target.remaining();
assert targetRemaining >= 0;
if (targetRemaining <= 0) // include condition targetRemaining == 0
return 0;
int n = Math.min(remaining, targetRemaining);
// Set source limit to prevent target overflow
if (targetRemaining < remaining)
limit(position() + n);
limit(pos + n);
try {
if (n > 0)
target.put(this);
@ -951,15 +959,19 @@ public abstract class $Type$Buffer
throw new ReadOnlyBufferException();
int srcPos = src.position();
int n = src.limit() - srcPos;
int srcLim = src.limit();
int srcRem = (srcPos <= srcLim ? srcLim - srcPos : 0);
int pos = position();
if (n > limit() - pos)
int lim = limit();
int rem = (pos <= lim ? lim - pos : 0);
if (srcRem > rem)
throw new BufferOverflowException();
putBuffer(pos, src, srcPos, n);
putBuffer(pos, src, srcPos, srcRem);
position(pos + n);
src.position(srcPos + n);
position(pos + srcRem);
src.position(srcPos + srcRem);
return this;
}