fix(framework): Remember missing sidecars as null in map

fujaba · Mar 31, 2024 · 4264510 · 4264510
1 parent 99e1bf8
commit 4264510
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/framework/src/main/java/org/fulib/fx/controller/ControllerManager.java b/framework/src/main/java/org/fulib/fx/controller/ControllerManager.java
@@ -148,7 +148,14 @@ public void init(@NotNull Object instance, @NotNull Map<@NotNull String, @Nullab
  }
 
  private @Nullable FxSidecar<?> getSidecar(@NotNull Object instance) {
- return sidecars.computeIfAbsent(instance.getClass(), this::createSidecar);
+ final Class<?> instanceClass = instance.getClass();
+ if (sidecars.containsKey(instanceClass)) {
+ return sidecars.get(instanceClass);
+ } else {
+ final FxSidecar<?> sidecar = createSidecar(instanceClass);
+ sidecars.put(instanceClass, sidecar);
+ return sidecar;
+ }
  }
 
  private FxSidecar<?> createSidecar(Class<?> componentClass) {