You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/05/08 16:57:59 UTC
svn commit: r942398 - in /maven/plugins/trunk/maven-clean-plugin/src:
main/java/org/apache/maven/plugin/clean/GlobSelector.java
test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
test/resources/unit/fileset-clean-test/plugin-pom.xml
Author: bentmann
Date: Sat May 8 14:57:59 2010
New Revision: 942398
URL: http://svn.apache.org/viewvc?rev=942398&view=rev
Log:
[MCLEAN-44] NullPointerException when using empty <exclude> to preserve base directory of fileset
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
Modified: maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java?rev=942398&r1=942397&r2=942398&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java Sat May 8 14:57:59 2010
@@ -99,6 +99,11 @@ class GlobSelector
private static String normalizePattern( String pattern )
{
+ if ( pattern == null )
+ {
+ return "";
+ }
+
String normalized = pattern.replace( ( File.separatorChar == '/' ) ? '\\' : '/', File.separatorChar );
if ( normalized.endsWith( File.separator ) )
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java?rev=942398&r1=942397&r2=942398&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java Sat May 8 14:57:59 2010
@@ -160,10 +160,9 @@ public class CleanMojoTest
assertTrue( checkEmpty( getBasedir() + "/target/test-classes/unit/fileset-clean-test/target/subdir" ) );
// fileset 2
- //TODO: MCLEAN-7
assertTrue( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/"
+ "buildOutputDirectory" ) );
- assertFalse( checkExists( getBasedir() + "/target/test-classes/fileset-clean-test/"
+ assertFalse( checkExists( getBasedir() + "/target/test-classes/unit/fileset-clean-test/"
+ "buildOutputDirectory/file.txt" ) );
}
Modified: maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml?rev=942398&r1=942397&r2=942398&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml Sat May 8 14:57:59 2010
@@ -40,7 +40,7 @@
<include>**</include>
</includes>
<excludes>
- <exclude>**</exclude>
+ <exclude></exclude>
</excludes>
</fileset>
</filesets>