Skip to content

Fix suppressed NPE in ThrottledProgressEventDispatcherWrapper.close() #4530

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
gavvvr wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −5
Open

Fix suppressed NPE in ThrottledProgressEventDispatcherWrapper.close() #4530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c90fd3e
fix: fix NPE in ThrottledProgressEventDispatcherWrapper.close
gavvvr Sep 21, 2026
6b2a6dc
refactor: use the recommended method for ensuring nullable reference …
gavvvr Sep 21, 2026
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
16 changes: 11 additions & 5 deletions ...ava/com/google/cloud/tools/jib/builder/steps/ThrottledProgressEventDispatcherWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.tools.jib.event.progress.ThrottledAccumulatingConsumer;
import com.google.common.base.Preconditions;
import java.io.Closeable;
import java.util.Objects;
import javax.annotation.Nullable;

/**
Expand All @@ -45,16 +46,21 @@ class ThrottledProgressEventDispatcherWrapper implements Closeable {
}

public void dispatchProgress(Long progressUnits) {
Preconditions.checkNotNull(throttledDispatcher);
Objects.requireNonNull(throttledDispatcher);
throttledDispatcher.accept(progressUnits);
}

@Override
public void close() {
Preconditions.checkNotNull(progressEventDispatcher);
Preconditions.checkNotNull(throttledDispatcher);
throttledDispatcher.close();
progressEventDispatcher.close();
try {
if (throttledDispatcher != null) {
throttledDispatcher.close();
}
} finally {
if (progressEventDispatcher != null) {
progressEventDispatcher.close();
}
}
}

void setProgressTarget(long allocationUnits) {
Expand Down
Loading