You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2008/05/14 22:20:29 UTC
svn commit: r656404 -
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Author: pgier
Date: Wed May 14 13:20:29 2008
New Revision: 656404
URL: http://svn.apache.org/viewvc?rev=656404&view=rev
Log:
[MNG-3545] Fix for profile deactivation.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=656404&r1=656403&r2=656404&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Wed May 14 13:20:29 2008
@@ -206,12 +206,12 @@
{
shouldAdd = true;
}
- else if ( !deactivatedIds.contains( profileId ) && isActive( profile ) )
+ else if ( isActive( profile ) )
{
shouldAdd = true;
}
- if ( shouldAdd )
+ if ( !deactivatedIds.contains( profileId ) && shouldAdd )
{
if ( "pom".equals( profile.getSource() ) )
{
@@ -230,6 +230,11 @@
{
String profileId = (String) it.next();
+ if ( deactivatedIds.contains( profileId ) )
+ {
+ continue;
+ }
+
Profile profile = (Profile) profilesById.get( profileId );
activeFromPom.add( profile );