From 07a035b146add31832908195806874e0543b5fb6 Mon Sep 17 00:00:00 2001 From: Paul Gier Date: Thu, 15 May 2008 20:42:27 +0000 Subject: [PATCH] Profiles should be activated if any of the activators return true. Issue id: MNG-3106 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656827 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/profiles/DefaultProfileManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index 238b5197a2..f8f297e717 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -293,14 +293,11 @@ public class DefaultProfileManager if ( activator.canDetermineActivation( profile, context ) ) { - boolean result = activator.isActive( profile, context ); - - if ( result ) + if ( activator.isActive( profile, context ) ) { container.getLogger().debug( "Profile: " + profile.getId() + " is active. (source: " + profile.getSource() + ")" ); + return true; } - - return result; } }