svn commit: r823345 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java

[bentmann]

Author: bentmann
Date: Thu Oct  8 22:15:18 2009
New Revision: 823345

URL: http://svn.apache.org/viewvc?rev=823345&view=rev
Log:
o Improved robustness against bad profile activation

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java?rev=823345&r1=823344&r2=823345&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
 Thu Oct  8 22:15:18 2009
@@ -94,9 +94,17 @@
     {
         for ( ProfileActivator activator : activators )
         {
-            if ( activator.isActive( profile, context, problems ) )
+            try
             {
-                return true;
+                if ( activator.isActive( profile, context, problems ) )
+                {
+                    return true;
+                }
+            }
+            catch ( RuntimeException e )
+            {
+                problems.addError( "Failed to determine activation for profile 
" + profile.getId(), e );
+                return false;
             }
         }
         return false;