This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 20272ad9aeb3dfd312163de2d0b013e5bb292aec Author: Thomas Watson <[email protected]> AuthorDate: Tue May 11 12:26:31 2021 -0500 FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService Check for null on calls to this.refs.get(). --- .../main/java/org/apache/felix/scr/impl/manager/DependencyManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java index 7e99e2a..c39585a 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java @@ -667,7 +667,7 @@ public class DependencyManager<S, T> implements ReferenceManager<S, T> null, getName(), trackingCount, serviceReference ); boolean reactivate = false; Collection<RefPair<S, T>> refs = this.refs.get(); - if (isActive() && refs.contains(refPair)) + if (isActive() && refs != null && refs.contains(refPair)) { reactivate = m_componentManager.invokeUpdatedMethod(DependencyManager.this, refPair, trackingCount); }
