Skip to content

fix: fix TCK failure #153

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

Merged
fjuma merged 1 commit into from
Jul 3, 2025
Merged

fix: fix TCK failure #153

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
3 changes: 2 additions & 1 deletion sdk-server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ public EventKind onMessageSend(MessageSendParams params) throws JSONRPCError {
ResultAggregator.EventTypeAndInterrupt etai = null;
try {
EventConsumer consumer = new EventConsumer(queue);
etai = resultAggregator.consumeAndBreakOnInterrupt(consumer);
producerRunnable.addDoneCallback(consumer.createAgentRunnableDoneCallback());
etai = resultAggregator.consumeAndBreakOnInterrupt(consumer);
Comment on lines 165 to +166
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Jul 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This reordering is a crucial fix for a potential race condition. To aid future maintenance and prevent this subtle bug from being reintroduced, I recommend adding a comment explaining why this specific order of operations is necessary.

            // It's crucial to add the done callback before starting to consume events.
            // This prevents a race condition where the producer thread might fail before
            // the consumer has registered the callback to handle the error, which could
            // otherwise lead to a deadlock.
            producerRunnable.addDoneCallback(consumer.createAgentRunnableDoneCallback());
            etai = resultAggregator.consumeAndBreakOnInterrupt(consumer);


if (etai == null) {
log.debug("No result, throwing InternalError");
throw new InternalError("No result");
Expand Down