This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new f15d777 FELIX-6514 NPE on ConfigurationEvent
f15d777 is described below
commit f15d77759b0448a7456b9cfc067900c4f47a52e3
Author: Raymond Augé <[email protected]>
AuthorDate: Thu Mar 24 23:31:37 2022 -0400
FELIX-6514 NPE on ConfigurationEvent
Signed-off-by: Raymond Augé <[email protected]>
---
.../src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
index b27bd19..44d930a 100644
---
a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
+++
b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
@@ -1683,7 +1683,8 @@ public class ConfigurationManager implements
BundleListener
private void sendEvent( final int serviceIndex )
{
- if ( (listenerProvider[serviceIndex].getState() & (Bundle.ACTIVE |
Bundle.STARTING)) > 0
+ if ( (listenerProvider[serviceIndex] != null)
+ && (listenerProvider[serviceIndex].getState() &
(Bundle.ACTIVE | Bundle.STARTING)) > 0
&& this.listeners[serviceIndex] != null )
{
Log.logger.log( LogService.LOG_DEBUG, "Sending {0} event for
{1} to {2}", new Object[]
