Skip to content

servlet: fix write when not ready in AsyncServletOutputStreamWriter #12790

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

Open
mgustimz wants to merge 11 commits into
base: master
Choose a base branch
from
+194 −5
Open

servlet: fix write when not ready in AsyncServletOutputStreamWriter #12790

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f87103
servlet: fix write when not ready in AsyncServletOutputStreamWriter
mgustimz May 2, 2026
60e9f16
servlet: fix write when not ready, narrow to writeBytes only
mgustimz May 5, 2026
44ee627
servlet: fix type comparison in runOrBuffer
mgustimz May 6, 2026
55e6629
Add AsyncServletOutputStreamWriterTest with mock isReady supplier
mgustimz May 6, 2026
3ebac15
Remove unused AtomicInteger in AsyncServletOutputStreamWriterTest
mgustimz May 7, 2026
1ef9eb8
Fix test and log message per Copilot review
mgustimz May 7, 2026
3f81019
Split flush and writeBytes into separate branches
mgustimz May 7, 2026
d79bdb6
Clean up test per Copilot review
mgustimz May 7, 2026
c73e67a
Add test validating write without onWritePossible is buffered
mgustimz May 7, 2026
e898755
Address Copilot review items from #4251754607
mgustimz May 8, 2026
8c217f5
Replace third test to cover flush-specific behavior
mgustimz May 8, 2026
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
12 changes: 5 additions & 7 deletions servlet/src/main/java/io/grpc/servlet/AsyncServletOutputStreamWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,11 @@ private void runOrBuffer(ActionItem actionItem) throws IOException {
if (actionItem == completeAction) {
return;
}
if (!isReady.getAsBoolean()) {
boolean successful =
writeState.compareAndSet(curState, curState.withReadyAndDrained(false));
LockSupport.unpark(parkingThread);
checkState(successful, "Bug: curState is unexpectedly changed by another thread");
log.finest("the servlet output stream becomes not ready");
}
boolean successful =
writeState.compareAndSet(curState, curState.withReadyAndDrained(false));
LockSupport.unpark(parkingThread);
checkState(successful, "Bug: curState is unexpectedly changed by another thread");
log.finest("the servlet output stream becomes not ready");
Comment thread
mgustimz marked this conversation as resolved.
Outdated
Comment thread
mgustimz marked this conversation as resolved.
Outdated
Comment thread
mgustimz marked this conversation as resolved.
Outdated
} else { // buffer to the writeChain
writeChain.offer(actionItem);
if (!writeState.compareAndSet(curState, curState.withReadyAndDrained(false))) {
Expand Down
Loading