Skip to content

Commit

Permalink
fix: prevent runtime issues when running with Vert.x HTTP client in n…
Browse files Browse the repository at this point in the history
…ative mode

Signed-off-by: Marc Nuri <[email protected]>
  • Loading branch information
manusa committed Apr 29, 2023
1 parent 00d3803 commit a044fca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit a044fca

Please sign in to comment.