Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed FirstByteCachingStream in JNH Connector #5571

Merged
merged 1 commit into from
Mar 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -360,48 +360,55 @@ private FirstByteCachingStream(InputStream inner) {
@Override
public int read() throws IOException {
lock.lock();
final int r = zero != -1 ? zero : inner.read();
zero = -1;
lock.unlock();
return r;
try {
final int r = zero != -1 ? zero : inner.read();
zero = -1;
return r;
} finally {
lock.unlock();
}
}

@Override
public int read(byte[] b, int off, int len) throws IOException {
lock.lock();
int r;
if (zero != -1) {
b[off] = (byte) (zero & 0xFF);
r = inner.read(b, off + 1, len - 1);
} else {
r = inner.read(b, off, len);
try {
if (zero != -1) {
b[off] = (byte) (zero & 0xFF);
r = inner.read(b, off + 1, len - 1);
} else {
r = inner.read(b, off, len);
}
zero = -1;
} finally {
lock.unlock();
}
zero = -1;
lock.unlock();
return r;

}

@Override
public int available() throws IOException {
lock.lock();
if (zero != -1) {
lock.unlock();
return 1;
}
try {
if (zero != -1) {
return 1;
}

int available = inner.available();
if (available != 1) {
lock.unlock();
return available;
}
int available = inner.available();
if (available != 1) {
return available;
}

zero = inner.read();
if (zero == -1) {
available = 0;
zero = inner.read();
if (zero == -1) {
available = 0;
}
return available;
} finally {
lock.unlock();
}
lock.unlock();
return available;
}

@Override
Expand All @@ -418,10 +425,14 @@ public boolean markSupported() {
}

@Override
public synchronized void mark(int readlimit) {
public void mark(int readlimit) {
inner.mark(readlimit);
}

@Override
public void reset() throws IOException {
inner.reset();
}
}

}
Loading