maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r683743 - /maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Date Thu, 07 Aug 2008 22:58:02 GMT
Author: jdcasey
Date: Thu Aug  7 15:58:02 2008
New Revision: 683743

URL: http://svn.apache.org/viewvc?rev=683743&view=rev
Log:
[MNG-3701] Avoid problems with null profile-id in the settings...use 'default' for missing
profile-id, which is standard in the POM IIRC...at least, it's standard with plugin executions
there.

Modified:
    maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java

Modified: maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=683743&r1=683742&r2=683743&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(original)
+++ maven/components/branches/maven-2.0.10-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Thu Aug  7 15:58:02 2008
@@ -192,6 +192,11 @@
         for ( Iterator profiles = settings.getProfiles().iterator(); profiles.hasNext();
)
         {
             Profile profile = (Profile) profiles.next();
+            if ( profile.getId() == null )
+            {
+                profile.setId( "default" );
+            }
+            
             if ( profile.getActivation() != null && profile.getActivation().isActiveByDefault()
                 && !activeProfiles.contains( profile.getId() ) )
             {



Mime
View raw message