You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2014/02/01 21:42:06 UTC

svn commit: r1563467 - /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java

Author: rfscholte
Date: Sat Feb  1 20:42:05 2014
New Revision: 1563467

URL: http://svn.apache.org/r1563467
Log:
[MSHARED-319] Filtering throws NPE when using JDK8

Modified:
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java

Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=1563467&r1=1563466&r2=1563467&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java Sat Feb  1 20:42:05 2014
@@ -214,7 +214,12 @@ public class DefaultMavenFileFilter
             {
                 @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 );
             }