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.

Sign up for GitHub

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

fix: prevent runtime issues when running with Vert.x HTTP client in native mode #5085

Merged
merged 1 commit into from
Apr 29, 2023
Merged

fix: prevent runtime issues when running with Vert.x HTTP client in native mode #5085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* fix #5036: Better websocket error handling for protocol / client enforced errors, also update frame/message limits
* Fix #5044: disable Vert.x instance file caching
* Fix #5059: Vert.x InputStreamReader uses an empty Buffer sentinel to avoid NPE
* Fix #5085: Vert.x HTTP Client InputStreamReadStream works in Native mode

#### Improvements
* Fix #4434: Update CronJobIT to use `batch/v1` CronJob instead
Expand Down
7 changes: 4 additions & 3 deletions httpclient-vertx/src/main/java/io/fabric8/kubernetes/client/vertx/InputStreamReadStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@

class InputStreamReadStream implements ReadStream<Buffer> {

private static final Buffer END_SENTINEL = Buffer.buffer();
private static final int CHUNK_SIZE = 2048;
private static final int MAX_DEPTH = 8;

private final Buffer endSentinel;
private final VertxHttpRequest vertxHttpRequest;
private final InputStream is;
private final HttpClientRequest request;
Expand All @@ -46,6 +46,7 @@ public InputStreamReadStream(VertxHttpRequest vertxHttpRequest, InputStream is,
this.vertxHttpRequest = vertxHttpRequest;
this.is = is;
this.request = request;
endSentinel = Buffer.buffer();
}

@Override
Expand All @@ -72,7 +73,7 @@ public ReadStream<Buffer> handler(Handler<Buffer> handler) {
}
if (handler != null) {
inboundBuffer.handler(buff -> {
if (buff == END_SENTINEL) {
if (buff == endSentinel) {
if (endHandler != null) {
endHandler.handle(null);
}
Expand Down Expand Up @@ -133,7 +134,7 @@ private void readChunk2() {
// Full
}
} else {
inboundBuffer.write(END_SENTINEL);
inboundBuffer.write(endSentinel);
}
} else {
if (exceptionHandler != null) {
Expand Down