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

fix(iot-dev): fix bug where client options was overridden #1749

Merged
merged 4 commits into from
Oct 18, 2023
Merged

fix(iot-dev): fix bug where client options was overridden #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8df1bda
fix(iot-dev): fix bug where client options was overridden
timtay-microsoft Oct 17, 2023
caa6d0d
fixup
timtay-microsoft Oct 17, 2023
703ae07
Merge branch 'main' into timtay/fix3
timtay-microsoft Oct 17, 2023
b3c5be4
Merge branch 'main' into timtay/fix3
timtay-microsoft Oct 17, 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
2 changes: 1 addition & 1 deletion ...ice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* Options that allow configuration of the device client instance during initialization.
*/
@Builder
@Builder(toBuilder = true)
public final class ClientOptions
{
private static final int DEFAULT_HTTPS_CONNECT_TIMEOUT_MILLISECONDS = 0;
Expand Down
10 changes: 8 additions & 2 deletions ...vice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ModuleClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,15 @@ public static ModuleClient createFromEnvironment(UnixDomainSocketChannel unixDom
sslContext = new IotHubSSLContext().getSSLContext();
}

if (clientOptions == null || clientOptions.getSslContext() == null)
if (clientOptions != null && clientOptions.getSslContext() == null)
{
// only override the SSLContext if the user didn't set it
// Clone the existing client options, but with the new SSLContext
timtay-microsoft marked this conversation as resolved.
Show resolved Hide resolved
clientOptions = clientOptions.toBuilder().sslContext(sslContext)
.build();
}
else if (clientOptions == null)
{
// only override the client options completely if the user didn't provide any
clientOptions = ClientOptions.builder().sslContext(sslContext).build();
}
else
Expand Down
Loading