Skip to content

Fix NPE when trying to resolve guards #1067

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
merged 3 commits into from
May 30, 2024
Merged

Fix NPE when trying to resolve guards #1067

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e12e7a3
Fix NPE when trying to resolve guards
attilakreiner May 28, 2024
bcc351b
fix
attilakreiner May 29, 2024
9a319b0
fix
attilakreiner May 30, 2024
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
22 changes: 12 additions & 10 deletions ...ngine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/EngineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,31 +421,33 @@ private void unregister(
private final class NameResolver
{
private final int namespaceId;
private final Matcher matchName;
private final ThreadLocal<Matcher> matchName;

private NameResolver(
int namespaceId)
{
this.namespaceId = namespaceId;
this.matchName = NamespaceAdapter.PATTERN_NAME.matcher("");
this.matchName = new ThreadLocal<>();
}

private long resolve(
String name)
{
long id = 0L;

if (name != null && matchName.reset(name).matches())
if (name != null)
{
String ns = matchName.group("namespace");
String n = matchName.group("name");
matchName.set(NamespaceAdapter.PATTERN_NAME.matcher(name));
if (matchName.get().matches())
{
String ns = matchName.get().group("namespace");
String n = matchName.get().group("name");

int nsid = ns != null ? supplyId.applyAsInt(ns) : namespaceId;
int nid = supplyId.applyAsInt(n);
int nsid = ns != null ? supplyId.applyAsInt(ns) : namespaceId;
int nid = supplyId.applyAsInt(n);

id = NamespacedId.id(nsid, nid);
id = NamespacedId.id(nsid, nid);
}
}

return id;
}

Expand Down