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

Properly release underlying buffer before passing it to WebSocket handler #2715

Merged
merged 4 commits into from
Feb 2, 2021
Merged

Properly release underlying buffer before passing it to WebSocket handler #2715

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
181381e
Properly release underlying buffer before passing it to handler.
spericas Feb 1, 2021
a90b5ab
Releases data chunks after passing them to Tyrus without any copying.…
spericas Feb 2, 2021
25eb9d5
Removed unused logger.
spericas Feb 2, 2021
a4c10f5
Fixed checkstyle.
spericas Feb 2, 2021
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
17 changes: 8 additions & 9 deletions webserver/tyrus/src/main/java/io/helidon/webserver/tyrus/TyrusReaderSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -63,16 +63,15 @@ public void onSubscribe(Flow.Subscription subscription) {

@Override
public void onNext(DataChunk item) {
// Copy underlying buffer into a ByteBuffer and release DataChunk
ByteBuffer byteBuffer = ByteBuffer.wrap(item.bytes());
romain-grecourt marked this conversation as resolved.
Show resolved Hide resolved
item.release();

// Submit buffer to Tyrus
if (executorService == null) {
for (ByteBuffer byteBuffer : item.data()) {
submitBuffer(byteBuffer);
}
submitBuffer(byteBuffer);
} else {
executorService.submit(() -> {
for (ByteBuffer byteBuffer : item.data()) {
submitBuffer(byteBuffer);
}
});
executorService.submit(() -> submitBuffer(byteBuffer));
}
}

Expand Down