Skip to content

Fix: Removed null check from getDefaultRequestConfigWithTimeout to create separate request configs #498

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
merged 7 commits into from
Jan 6, 2023
Merged

Fix: Removed null check from getDefaultRequestConfigWithTimeout to create separate request configs #498

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c966034
return null when fetch fails
zashraf1985 Dec 21, 2022
7f87456
Added a function to create a copy of userContext, this will avoid sen…
NomanShoaib Dec 29, 2022
4a065d8
Added odp config disable functionality
NomanShoaib Jan 2, 2023
92cb910
Reverting adding disable odp Option in sdk
NomanShoaib Jan 5, 2023
4424257
header update
NomanShoaib Jan 5, 2023
45c5d82
Merge branch 'master' into mnoman/disableODP
jaeopt Jan 6, 2023
a9ac98f
Merge branch 'master' into mnoman/disableODP
jaeopt Jan 6, 2023
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
14 changes: 6 additions & 8 deletions core-httpclient-impl/src/main/java/com/optimizely/ab/HttpClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
*
* Copyright 2016-2017, 2019, Optimizely and contributors
* Copyright 2016-2017, 2019, 2022-2023, Optimizely and contributors
*
* 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 @@ -39,13 +39,11 @@ private HttpClientUtils() {
.build();

public static RequestConfig getDefaultRequestConfigWithTimeout(int timeoutMillis) {
if (requestConfigWithTimeout == null) {
Copy link
Contributor

@jaeopt jaeopt Jan 3, 2023

Choose a reason for hiding this comment

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

I understand we try to re-use RequestConfig once created. Curious why we do not want to reuse?

Copy link
Contributor Author

@mnoman09 mnoman09 Jan 5, 2023

Choose a reason for hiding this comment

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

this function is getting used at multiple places (for setting request config with timeout of SegmentAPIManager as well as for EventAPIManager). If we want to use different timeout for different Request config then this check will not allow that as it will return the first object that was initialized.

requestConfigWithTimeout = RequestConfig.custom()
.setConnectTimeout(timeoutMillis)
.setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT_MS)
.setSocketTimeout(SOCKET_TIMEOUT_MS)
.build();
}
requestConfigWithTimeout = RequestConfig.custom()
.setConnectTimeout(timeoutMillis)
.setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT_MS)
.setSocketTimeout(timeoutMillis)
.build();
return requestConfigWithTimeout;
}

Expand Down