Merge pull request #40267 from mkouba/arc-eager-instance-npe

ArC: prevent NPE when EagerInstanceHandle.UNAVAILABLE is closed
quarkusio · Apr 25, 2024 · 438c23e · 438c23e
2 parents e2315ec + 6ecefbe
commit 438c23e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...endent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java b/...endent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java
@@ -18,7 +18,7 @@ abstract class AbstractInstanceHandle<T> implements InstanceHandle<T> {
     private static final AtomicIntegerFieldUpdater<AbstractInstanceHandle> DESTROYED_UPDATER = AtomicIntegerFieldUpdater
             .newUpdater(AbstractInstanceHandle.class, "destroyed");
 
-    private final InjectableBean<T> bean;
+    protected final InjectableBean<T> bean;
     private final CreationalContext<T> creationalContext;
     private final CreationalContext<?> parentCreationalContext;
     private final Consumer<T> destroyLogic;
@@ -56,7 +56,7 @@ public void destroy() {
         if (isInstanceCreated() && DESTROYED_UPDATER.compareAndSet(this, 0, 1)) {
             if (destroyLogic != null) {
                 destroyLogic.accept(instanceInternal());
-            } else {
+            } else if (bean != null) {
                 if (bean.getScope().equals(Dependent.class)) {
                     destroyInternal();
                 } else {

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java
@@ -8,8 +8,10 @@
 import io.quarkus.arc.InstanceHandle;
 
 /**
+ * Instance handle that is initialized eagerly when created.
  *
  * @param <T>
+ * @see LazyInstanceHandle
  */
 class EagerInstanceHandle<T> extends AbstractInstanceHandle<T> {
 
@@ -34,7 +36,7 @@ public static final <T> InstanceHandle<T> unavailable() {
 
     @Override
     protected boolean isInstanceCreated() {
-        return true;
+        return instance != null;
     }
 
     @Override

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java
@@ -8,8 +8,10 @@
 import io.quarkus.arc.InjectableBean;
 
 /**
+ * Instance handle that is initialized lazily when first used.
  *
  * @param <T>
+ * @see EagerInstanceHandle
  */
 class LazyInstanceHandle<T> extends AbstractInstanceHandle<T> {