[felix-dev] branch master updated: [FELIX-6393] Avoid NPE when filter is not set

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre 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 1af914e  [FELIX-6393] Avoid NPE when filter is not set
     new 081b6fe  Merge pull request #108 from jbonofre/FELIX-6393
1af914e is described below

commit 1af914efda6fb393db2b34feeac1abdfacdf236c
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Mon Oct 18 14:19:37 2021 +0200

    [FELIX-6393] Avoid NPE when filter is not set
---
 .../src/main/java/org/apache/felix/fileinstall/internal/Scanner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java 
b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
index ff7dbf6..9e0290e 100644
--- 
a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
+++ 
b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
@@ -153,7 +153,7 @@ public class Scanner implements Closeable {
                 }
             }
             else {
-                if (!filter.accept(file.getParentFile(),file.getName())){
+                if (filter != null && 
!filter.accept(file.getParentFile(),file.getName())){
                     continue;
                 }
             }