Skip to content

fix: NPE in handleRecentResourceUpdate for an unknown secondary resource #3519

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

Draft
csviri wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: NPE in handleRecentResourceUpdate for an unknown secondary resource #3519

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
2 changes: 1 addition & 1 deletion .../javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public synchronized void handleRecentResourceUpdate(
if (actualValues != null) {
var resourceId = resourceIDMapper.idFor(resource);
R actualResource = actualValues.get(resourceId);
if (actualResource.equals(previousVersionOfResource)) {
if (actualResource != null && actualResource.equals(previousVersionOfResource)) {
actualValues.put(resourceId, resource);
}
}
Expand Down
11 changes: 11 additions & 0 deletions ...aoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,17 @@ void genericFilteringEvents() {
verify(eventHandler, times(0)).handleEvent(any());
}

@Test
void recentResourceUpdateIsIgnoredForUnknownSecondaryResource() {
source.handleResources(primaryID1(), Set.of(testResource1()));

// testResource2 has a different id, so it is not present in the cache for primaryID1
var unknown = testResource2();
source.handleRecentResourceUpdate(primaryID1(), unknown, unknown);

assertThat(source.getSecondaryResources(primaryID1())).containsExactly(testResource1());
}

public static class TestExternalCachingEventSource
extends ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata, String> {
public TestExternalCachingEventSource() {
Expand Down
Loading