[felix-dev] branch master updated: Resolve possible NPE for filter

[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 f2bda88  Resolve possible NPE for filter
     new 8b8cf80  Merge pull request #53 from daniele-moro/master
f2bda88 is described below

commit f2bda88b2021311eb24f9c37759f708c40d1978a
Author: Daniele Moro <dani...@opennetworking.org>
AuthorDate: Thu Oct 1 14:31:48 2020 +0200

    Resolve possible NPE for filter
---
 .../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 a680b48..b977f3e 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
@@ -155,7 +155,7 @@ public class Scanner implements Closeable {
                 }
             }
             else {
-                if (!filter.accept(file.getParentFile(),file.getName())){
+                if (filter != null && 
!filter.accept(file.getParentFile(),file.getName())){
                     continue;
                 }
             }