You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/03/13 11:09:50 UTC
svn commit: r1300049 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Author: olamy
Date: Tue Mar 13 10:09:49 2012
New Revision: 1300049
URL: http://svn.apache.org/viewvc?rev=1300049&view=rev
Log:
backward comp and take care of NPE
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1300049&r1=1300048&r2=1300049&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Tue Mar 13 10:09:49 2012
@@ -31,6 +31,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -53,6 +54,16 @@ public class MinijarFilter
private int classesRemoved;
+ public MinijarFilter( MavenProject project, Log log )
+ throws IOException
+ {
+ this( project, log, Collections.<SimpleFilter>emptyList() );
+ }
+
+ /**
+ *
+ * @since 1.6
+ */
public MinijarFilter( MavenProject project, Log log, List<SimpleFilter> simpleFilters )
throws IOException
{
@@ -84,7 +95,9 @@ public class MinijarFilter
removePackages( artifactUnit );
removable.removeAll( artifactUnit.getClazzes() );
removable.removeAll( artifactUnit.getTransitiveDependencies() );
- removeSpecificallyIncludedClasses( project, simpleFilters );
+ removeSpecificallyIncludedClasses( project, simpleFilters == null
+ ? Collections.<SimpleFilter>emptyList()
+ : simpleFilters );
}
private void removePackages( ClazzpathUnit artifactUnit )