continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r332781 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
Date Sat, 12 Nov 2005 15:16:25 GMT
Author: evenisse
Date: Sat Nov 12 07:16:20 2005
New Revision: 332781

URL: http://svn.apache.org/viewcvs?rev=332781&view=rev
Log:
Fix notifier initialization

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=332781&r1=332780&r2=332781&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
Sat Nov 12 07:16:20 2005
@@ -261,22 +261,7 @@
         {
             String currentNagEmailAddress = null;
 
-            if ( project.getNotifiers() != null && !project.getNotifiers().isEmpty()
)
-            {
-                for ( Iterator i = project.getNotifiers().iterator(); i.hasNext(); )
-                {
-                    ProjectNotifier notif = (ProjectNotifier) i.next();
-
-                    // Can we have an other type for maven 1 project?
-                    if ( "mail".equals( notif.getType() ) )
-                    {
-                        currentNagEmailAddress = (String) notif.getConfiguration().get(
-                            ContinuumRecipientSource.ADDRESS_FIELD );
-                    }
-                }
-            }
-
-            String nagEmailAddress = getValue( build, "nagEmailAddress", currentNagEmailAddress
);
+            String nagEmailAddress = getValue( build, "nagEmailAddress", null );
 
             if ( nagEmailAddress != null )
             {
@@ -290,7 +275,7 @@
             }
         }
 
-        if ( notifier == null && notifier.getConfiguration().isEmpty() )
+        if ( notifier == null && ( notifiers == null || notifiers.isEmpty() ) )
         {
             throw new MavenOneMetadataHelperException(
                 "Missing 'nagEmailAddress' element in the 'build' element in the POM." );



Mime
View raw message