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

[jdcasey]

Author: jdcasey
Date: Mon Feb 18 17:08:45 2008
New Revision: 628942

URL: http://svn.apache.org/viewvc?rev=628942&view=rev
Log:
[MASSEMBLY-277] Fixing potential NPE in AddFileSetsTask.
Submitted by: Sejal Patel

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=628942&r1=628941&r2=628942&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
 Mon Feb 18 17:08:45 2008
@@ -97,12 +97,12 @@
 
         FileSetFormatter fileSetFormatter = new FileSetFormatter( 
configSource, logger );
 
-        File basedir = project.getBasedir();
-
         if ( project == null )
         {
             project = configSource.getProject();
         }
+
+        File basedir = project.getBasedir();
 
         String destDirectory = fileSet.getOutputDirectory();