Throw an exception without setting configuredProvider to null when ge…

…tCDI returns null

Signed-off-by: Benjamin Confino <[email protected]>

api/src/main/java/jakarta/enterprise/inject/spi/CDI.java

@@ -44,6 +44,7 @@
 public abstract class CDI<T> implements Instance<T> {
 
     private static final Object lock = new Object();
+    private static volatile boolean providerSetManually = false;
     protected static volatile Set<CDIProvider> discoveredProviders = null;
     protected static volatile CDIProvider configuredProvider = null;
 
@@ -79,6 +80,11 @@ private static CDIProvider getCDIProvider() {
             }
         } catch (IllegalStateException ignored) {
         }
+        //configuredProvider cannot be null if providerSetManually is true. If it somehow is an NPE is appropriate
+.
+        if (providerSetManually && configuredProvider.getCDI() == null) {
+            throw new IllegalStateException("Unable to access CDI");
+        }
         configuredProvider = null;
         // Discover providers and cache
         if (discoveredProviders == null) {
@@ -116,6 +122,7 @@ private static boolean checkProvider(CDIProvider c) {
      */
     public static void setCDIProvider(CDIProvider provider) {
         if (provider != null) {
+            providerSetManually = true;
             configuredProvider = provider;
         } else {
             throw new IllegalStateException("CDIProvider must not be null");