commit ae40de0bed2a4590f71f44a4b78d25fd8a6d124e
author Robert Scholte <rfscholte@apache.org> Sat Feb 01 20:42:05 2014 +0000
committer Robert Scholte <rfscholte@apache.org> Sat Feb 01 20:42:05 2014 +0000
tree 8c81043cb4fcae5f25678b8e8152d7500b1d967a
parent 1a03c39c0958e202ee5b026bddce65d11c2c5e0d

[MSHARED-319] Filtering throws NPE when using JDK8

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1563467 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java

diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
index 26b8988..7fbf119 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -214,7 +214,12 @@
             {
                 @SuppressWarnings( "unchecked" )
                 List<String> buildFilters = new ArrayList<String>( request.getMavenProject().getBuild().getFilters() );
-                buildFilters.removeAll( request.getFileFilters() );
+
+                // JDK-8015656: (coll) unexpected NPE from removeAll 
+                if ( request.getFileFilters() != null )
+                {
+                    buildFilters.removeAll( request.getFileFilters() );
+                }
 
                 loadProperties( filterProperties, buildFilters, baseProps );
             }