This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 7650a39c517bafc6fff19708828493d694fc5c85 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Apr 1 13:59:55 2020 +0200 [FELIX-6109] Fix possible NPE in DirectoryWatcher.findListener --- .../main/java/org/apache/felix/fileinstall/internal/FileInstall.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java index 5ccaecd..eafcf21 100644 --- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java +++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java @@ -149,7 +149,9 @@ public class FileInstall implements BundleActivator, ServiceTrackerCustomizer public Object addingService(ServiceReference serviceReference) { ArtifactListener listener = (ArtifactListener) context.getService(serviceReference); - addListener(serviceReference, listener); + if (listener != null) { + addListener(serviceReference, listener); + } return listener; } public void modifiedService(ServiceReference reference, Object service)
