You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/01/12 10:45:33 UTC

svn commit: r1557505 - /maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java

Author: hboutemy
Date: Sun Jan 12 09:45:33 2014
New Revision: 1557505

URL: http://svn.apache.org/r1557505
Log:
init the collection only once

Modified:
    maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java

Modified: maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1557505&r1=1557504&r2=1557505&view=diff
==============================================================================
--- maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (original)
+++ maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Sun Jan 12 09:45:33 2014
@@ -209,6 +209,8 @@ public abstract class AbstractScmPublish
     @Parameter
     protected String[] extraNormalizeExtensions;
 
+    private Set<String> normalizeExtensions;
+
     protected ScmProvider scmProvider;
 
     protected ScmRepository scmRepository;
@@ -236,13 +238,16 @@ public abstract class AbstractScmPublish
     protected boolean requireNormalizeNewlines( File f )
         throws IOException
     {
-        List<String> extensions = Arrays.asList( NORMALIZE_EXTENSIONS );
-        if ( extraNormalizeExtensions != null )
+        if ( normalizeExtensions == null )
         {
-            extensions.addAll( Arrays.asList( extraNormalizeExtensions ) );
+            normalizeExtensions = new HashSet<String>( Arrays.asList( NORMALIZE_EXTENSIONS ) );
+            if ( extraNormalizeExtensions != null )
+            {
+                normalizeExtensions.addAll( Arrays.asList( extraNormalizeExtensions ) );
+            }
         }
 
-        return FilenameUtils.isExtension( f.getName(), extensions );
+        return FilenameUtils.isExtension( f.getName(), normalizeExtensions );
     }
 
     private ReleaseDescriptor setupScm()