WELD-2761 Fix BeanManager not returning empty set if there are no con…

…texts for given scope via getContexts() methods
weld · Oct 3, 2023 · d194573 · d194573
1 parent d6729a0
commit d194573
Showing 1 changed file with 2 additions and 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
@@ -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) {