Skip to content

Fix config watcher to skip unregistered watch keys #1630

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

Merged
jfallows merged 1 commit into from
Jan 14, 2026
Merged

Fix config watcher to skip unregistered watch keys #1630

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
7 changes: 5 additions & 2 deletions ...rc/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatchTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,11 @@ public final Void call() throws IOException
try
{
final WatchKey key = watcher.take();
final Path watchable = (Path) key.watchable();
onPathChanged(watchable);
if (key != null)
{
final Path watchable = (Path) key.watchable();
onPathChanged(watchable);
}
}
catch (InterruptedException ex)
{
Expand Down
4 changes: 1 addition & 3 deletions .../src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,7 @@ private WatchKey registerImpl(
private WatchKey takeImpl() throws InterruptedException
{
WatchKey watchKey = watcher.take();
CompoundWatchKey compoundKey = compoundKeys.get(watchKey);

return compoundKey;
return compoundKeys.get(watchKey);
}

private final class CompoundWatchKey implements WatchKey
Expand Down
Loading