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

Jump to bottom

xds: Check for validity of xdsClient in ClusterImplLbHelper #11553

Merged
merged 2 commits into from
Sep 24, 2024
Merged

xds: Check for validity of xdsClient in ClusterImplLbHelper #11553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b785cd
Added null check for xdsClient in onSubChannelState. This avoids NPE
DNVindhya Sep 24, 2024
7ad4e52
Added comment describing the change
DNVindhya Sep 24, 2024
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 xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ public void start(SubchannelStateListener listener) {
delegate().start(new SubchannelStateListener() {
@Override
public void onSubchannelState(ConnectivityStateInfo newState) {
if (newState.getState().equals(ConnectivityState.READY)) {
// Do nothing if LB has been shutdown
if (xdsClient != null && newState.getState().equals(ConnectivityState.READY)) {
ejona86 marked this conversation as resolved.
Show resolved Hide resolved
// Get locality based on the connected address attributes
ClusterLocality updatedClusterLocality = createClusterLocalityFromAttributes(
subchannel.getConnectedAddressAttributes());
Expand Down