svn commit: r758926 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java

[olamy]

Author: olamy
Date: Thu Mar 26 23:44:16 2009
New Revision: 758926

URL: http://svn.apache.org/viewvc?rev=758926&view=rev
Log:
[MSHARED-100] null safe call for 
DefaultMavenFileFilter.getDefaultFilterWrappers()
Submitted by Robert Scholte

Modified:
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
    
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.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=758926&r1=758925&r2=758926&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
 Thu Mar 26 23:44:16 2009
@@ -133,8 +133,11 @@
         final Properties baseProps = new Properties();
 
         // Project properties
-        baseProps.putAll( mavenProject.getProperties() == null ? 
Collections.EMPTY_MAP : mavenProject
-            .getProperties() );
+        if(mavenProject != null) 
+        {
+            baseProps.putAll( mavenProject.getProperties() == null ? 
Collections.EMPTY_MAP : mavenProject
+                    .getProperties() );
+        }
         // TODO this is NPE free but do we consider this as normal
         // or do we have to throw an MavenFilteringException with mavenSession 
cannot be null
         if ( mavenSession != null )
@@ -149,11 +152,14 @@
 
         loadProperties( filterProperties, filters, baseProps );
 
-        loadProperties( filterProperties, 
mavenProject.getBuild().getFilters(), baseProps );
+        if(mavenProject != null) 
+        {
+            loadProperties( filterProperties, 
mavenProject.getBuild().getFilters(), baseProps );
 
-        // Project properties
-        filterProperties.putAll( mavenProject.getProperties() == null ? 
Collections.EMPTY_MAP : mavenProject
-            .getProperties() );
+               // Project properties
+               filterProperties.putAll( mavenProject.getProperties() == null ? 
Collections.EMPTY_MAP : mavenProject
+                   .getProperties() );
+        }
         if ( mavenSession != null )
         {
             // execution properties wins

Modified: 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=758926&r1=758925&r2=758926&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
 Thu Mar 26 23:44:16 2009
@@ -90,5 +90,14 @@
         assertEquals( "older file", properties.getProperty( "version" ) );
 
     }    
+    
+    public void testNullSafeDefaultFilterWrappers() throws Exception 
+    {
+       MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( 
MavenFileFilter.class.getName(), "default" );
+       
+       mavenFileFilter.getDefaultFilterWrappers(null, null, false, null, null);
+       
+       //shouldn't fail
+    }
 
 }