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

svn commit: r1645049 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java

Author: krosenvold
Date: Fri Dec 12 19:45:43 2014
New Revision: 1645049

URL: http://svn.apache.org/r1645049
Log:
Null check

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=1645049&r1=1645048&r2=1645049&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Fri Dec 12 19:45:43 2014
@@ -210,12 +210,12 @@ public class AddFileSetsTask
 
     static boolean isWindowsPath( String destDirectory )
     {
-        return ( destDirectory.length() >= 2 && destDirectory.charAt( 1 ) == ':' );
+        return ( destDirectory != null && destDirectory.length() >= 2 && destDirectory.charAt( 1 ) == ':' );
     }
 
     static boolean isLinuxRootReference( String destDirectory )
     {
-        return ( destDirectory.startsWith( "/" ) );
+        return ( destDirectory != null && destDirectory.startsWith( "/" ) );
     }
 
     File getFileSetDirectory( final FileSet fileSet, final File basedir, final File archiveBaseDir )