svn commit: r693955 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java

[jdcasey]

Author: jdcasey
Date: Wed Sep 10 12:46:18 2008
New Revision: 693955

URL: http://svn.apache.org/viewvc?rev=693955&view=rev
Log:
ok, NOW I'm restoring 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=693955&r1=693954&r2=693955&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 Sep 10 12:46:18 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 );