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/15 22:33:58 UTC
svn commit: r656820 -
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Author: pgier
Date: Thu May 15 13:33:58 2008
New Revision: 656820
URL: http://svn.apache.org/viewvc?rev=656820&view=rev
Log:
[MNG-3106] A profile should be activated if any of its activators return true.
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=656820&r1=656819&r2=656820&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 Thu May 15 13:33:58 2008
@@ -270,7 +270,10 @@
if ( activator.canDetermineActivation( profile ) )
{
- return activator.isActive( profile );
+ if ( activator.isActive( profile ) )
+ {
+ return true;
+ }
}
}