Skip to content

fix: avoid NPE when selector/rule sync data is null (#6890) #6925

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
juicewcode wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: avoid NPE when selector/rule sync data is null (#6890) #6925

Show file tree
Hide file tree
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
9 changes: 3 additions & 6 deletions ...ync-data-http/src/main/java/org/apache/shenyu/sync/data/http/refresh/RuleDataRefresh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ public ConfigData<?> cacheConfigData() {

@Override
protected void refresh(final List<RuleData> data) {
pluginDataSubscriber.refreshRuleDataAll();
if (CollectionUtils.isEmpty(data)) {
LOG.info("clear all rule cache, old cache");
data.forEach(pluginDataSubscriber::unRuleSubscribe);
pluginDataSubscriber.refreshRuleDataAll();
} else {
// update cache for UpstreamCacheManager
pluginDataSubscriber.refreshRuleDataAll();
data.forEach(pluginDataSubscriber::onRuleSubscribe);
return;
}
data.forEach(pluginDataSubscriber::onRuleSubscribe);
}
}
9 changes: 3 additions & 6 deletions ...data-http/src/main/java/org/apache/shenyu/sync/data/http/refresh/SelectorDataRefresh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ public ConfigData<?> cacheConfigData() {

@Override
protected void refresh(final List<SelectorData> data) {
pluginDataSubscriber.refreshSelectorDataAll();
if (CollectionUtils.isEmpty(data)) {
LOG.info("clear all selector cache, old cache");
data.forEach(pluginDataSubscriber::unSelectorSubscribe);
pluginDataSubscriber.refreshSelectorDataAll();
} else {
// update cache for UpstreamCacheManager
pluginDataSubscriber.refreshSelectorDataAll();
data.forEach(pluginDataSubscriber::onSelectorSubscribe);
return;
}
data.forEach(pluginDataSubscriber::onSelectorSubscribe);
}
}
15 changes: 15 additions & 0 deletions ...data-http/src/test/java/org/apache/shenyu/sync/data/http/refresh/RuleDataRefreshTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

public final class RuleDataRefreshTest {

Expand Down Expand Up @@ -78,4 +82,15 @@ public void testRefresh() {
ruleDataList.add(ruleData);
ruleDataRefresh.refresh(ruleDataList);
}

@Test
public void testRefreshWithNullData() {
final PluginDataSubscriber subscriber = mock(PluginDataSubscriber.class);
final RuleDataRefresh ruleDataRefresh = new RuleDataRefresh(subscriber);
// data is null, should not throw NPE; cache is still refreshed unconditionally, then return early
ruleDataRefresh.refresh((List<RuleData>) null);
verify(subscriber).refreshRuleDataAll();
verify(subscriber, never()).unRuleSubscribe(any(RuleData.class));
verify(subscriber, never()).onRuleSubscribe(any(RuleData.class));
}
}
15 changes: 15 additions & 0 deletions ...-http/src/test/java/org/apache/shenyu/sync/data/http/refresh/SelectorDataRefreshTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -78,4 +82,15 @@ public void testRefreshCoverage() {
selectorDataList.add(selectorData);
selectorDataRefresh.refresh(selectorDataList);
}

@Test
public void testRefreshWithNullData() {
final PluginDataSubscriber subscriber = mock(PluginDataSubscriber.class);
final SelectorDataRefresh selectorDataRefresh = new SelectorDataRefresh(subscriber);
// data is null, should not throw NPE; cache is still refreshed unconditionally, then return early
selectorDataRefresh.refresh((List<SelectorData>) null);
verify(subscriber).refreshSelectorDataAll();
verify(subscriber, never()).unSelectorSubscribe(any(SelectorData.class));
verify(subscriber, never()).onSelectorSubscribe(any(SelectorData.class));
}
}
Loading