Skip to content

fix: set connection401Error before invoking resultCallback in onError #332

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

Draft
kinyoklion wants to merge 7 commits into
base: main
Choose a base branch
from
+5 −4
Draft

fix: set connection401Error before invoking resultCallback in onError #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c8aa5d
test: poll for shutDownCalled in startWithHttp401PreventsSubsequentSt…
devin-ai-integration[bot] Mar 19, 2026
806d4a0
ci: re-run tests to verify flake fix (run 1)
devin-ai-integration[bot] Mar 19, 2026
fc30c1e
ci: re-run tests to verify flake fix (run 2)
devin-ai-integration[bot] Mar 19, 2026
1b66b4f
Merge branch 'main' into devin/1773960729-fix-flaky-streaming-test
kinyoklion Mar 24, 2026
753f946
fix: set connection401Error before invoking resultCallback in onError
devin-ai-integration[bot] Mar 24, 2026
38416a5
Merge remote-tracking branch 'origin/devin/1773960729-fix-flaky-strea…
devin-ai-integration[bot] Mar 24, 2026
4201d23
fix: set connection401Error before callback, keep original shutDown o…
devin-ai-integration[bot] Mar 25, 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
4 changes: 3 additions & 1 deletion ...ly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/StreamingDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,11 @@ public void onError(Throwable t) {
if (code >= 400 && code < 500) {
logger.error("Encountered non-retriable error: {}. Aborting connection to stream. Verify correct Mobile Key and Stream URI", code);
running = false;
Copy link
Copy Markdown
Member Author

@kinyoklion kinyoklion Mar 25, 2026

Choose a reason for hiding this comment

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

I think we should keep the original callback order, but we should set connection401Error before the callbacks.

Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration bot Mar 25, 2026

Choose a reason for hiding this comment

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

Updated — connection401Error is now set before the callback, while dataSourceUpdateSink.shutDown() remains after the callback to preserve the original status listener notification ordering.

The startWithHttp401ShutsDownSink test retains the polling workaround for shutDownCalled since shutDown() still executes after the callback returns. The startWithHttp401PreventsSubsequentStart test no longer needs any workaround since connection401Error is set before the callback unblocks.

resultCallback.onError(new LDInvalidResponseCodeFailure("Unexpected Response Code From Stream Connection", t, code, false));
if (code == 401) {
connection401Error = true;
}
resultCallback.onError(new LDInvalidResponseCodeFailure("Unexpected Response Code From Stream Connection", t, code, false));
if (code == 401) {
dataSourceUpdateSink.shutDown();
}
stop(null);
Expand Down
5 changes: 2 additions & 3 deletions ...ndroid-client-sdk/src/test/java/com/launchdarkly/sdk/android/StreamingDataSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,8 @@ public void startWithHttp401ShutsDownSink() throws Exception {
LDInvalidResponseCodeFailure failure = (LDInvalidResponseCodeFailure) error;
assertEquals(401, failure.getResponseCode());
assertFalse(failure.isRetryable());
// The background thread calls resultCallback.onError() before
// dataSourceUpdateSink.shutDown(), so shutDownCalled may not be true yet.
// Poll briefly to allow the background thread to complete.
// shutDown() is called after the error callback, so we need to
// wait briefly for the background thread to complete the call.
long deadline = System.currentTimeMillis() + 1000;
while (!dataSourceUpdateSink.shutDownCalled && System.currentTimeMillis() < deadline) {
Thread.sleep(10);
Expand Down