Skip to content

Fix NPE in canCompleteSwap when path doesn't exist #3162

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

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NPE in canCompleteSwap when path doesn't exist #3162

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
4 changes: 4 additions & 0 deletions helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,10 @@ private boolean canCompleteSwap(String clusterName, String swapOutInstanceName,
List<String> swapOutResources = baseAccessor.getChildNames(
PropertyPathBuilder.instanceCurrentState(clusterName, swapOutInstanceName,
swapOutLastActiveSession), 0);
if (swapOutResources == null) {
// No current states found for the swap-out instance, swap is complete
return true;
}
Comment on lines +555 to +558

@junkaixue junkaixue Sep 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Probably throw exception would be better. Should not silently swallow it.

for (String swapOutResource : swapOutResources) {
// Get the topState and secondTopStates for the stateModelDef used by the resource.
IdealState idealState = accessor.getProperty(keyBuilder.idealStates(swapOutResource));
Expand Down
Loading