From d09c7e98c2e3a4ba9763587bd0621eb7e7507d6f Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Tue, 3 Oct 2023 20:19:05 +0200
Subject: [PATCH] WELD-2761 Fix BeanManager not returning empty set if there
 are no contexts for given scope via getContexts() methods

---
 impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
index f653890188..c7517058fd 100644
--- a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
+++ b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
@@ -658,7 +658,8 @@ public Context getContext(Class<? extends Annotation> scopeType) {
 
     @Override
     public Collection<Context> getContexts(Class<? extends Annotation> scopeType) {
-        return Collections.unmodifiableList(contexts.get(scopeType));
+        List<Context> found = this.contexts.get(scopeType);
+        return found != null ? Collections.unmodifiableList(found) : Collections.EMPTY_LIST;
     }
 
     public Context getUnwrappedContext(Class<? extends Annotation> scopeType) {