svn commit: r980883 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java

[be...@apache.org]

Author: bentmann
Date: Fri Jul 30 16:45:44 2010
New Revision: 980883

URL: http://svn.apache.org/viewvc?rev=980883&view=rev
Log:
[MRELEASE-551] Unable to release with maven 3 when having no $HOME/.m2/settings.xml

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=980883&r1=980882&r2=980883&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Fri Jul 30 16:45:44 2010
@@ -364,8 +364,12 @@ public class InvokerMavenExecutor
 
         if ( releaseEnvironment.getSettings() != null )
         {
-            // FIXME: This is effectively useless, since getFile() always returns null
-            req.setUserSettingsFile( releaseEnvironment.getSettings().getRuntimeInfo().getFile() );
+            // FIXME: This is effectively useless in Maven 2.x, since getFile() always returns null
+            File settingsFile = releaseEnvironment.getSettings().getRuntimeInfo().getFile();
+            if ( settingsFile != null && settingsFile.isFile() )
+            {
+                req.setUserSettingsFile( settingsFile );
+            }
         }
 
         File localRepoDir = releaseEnvironment.getLocalRepositoryDirectory();