diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 2688d8144d..5ec7e4f5a9 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -37,6 +37,7 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; +import javax.mail.Address; import javax.servlet.ServletException; import org.kohsuke.stapler.StaplerRequest; @@ -70,6 +71,8 @@ public abstract class AbstractProject

,R extends A */ private Integer quietPeriod = null; + public volatile Set culprits = new HashSet(); + /** * If this project is configured to be only built on a certain label, * this value will be set to that label. diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index b9d37fd8b2..f052e5fa62 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -117,6 +117,9 @@ public class MailSender

, B extends AbstractBuild appendBuildUrl(build, buf); msg.setText(buf.toString()); + // Reset the list of culprits + build.getProject().culprits.clear(); + return msg; } @@ -248,18 +251,18 @@ public class MailSender

, B extends AbstractBuild listener.getLogger().println("Trying to send e-mails to individuals who broke the build. sizeof(changeset)=="+count); } - Set users = new HashSet(); for (Entry change : build.getChangeSet()) { - User a = change.getAuthor(); - if (users.add(a)) { - String adrs = Util.fixEmpty(a.getProperty(Mailer.UserProperty.class).getAddress()); - if(debug) - listener.getLogger().println(" User "+a.getId()+" -> "+adrs); - if (adrs != null) - rcp.add(new InternetAddress(adrs)); - else { - listener.getLogger().println("Failed to send e-mail to " + a.getFullName() + " because no e-mail address is known, and no default e-mail domain is configured"); - } + build.getProject().culprits.add(change.getAuthor()); + } + + for (User a : build.getProject().culprits) { + String adrs = Util.fixEmpty(a.getProperty(Mailer.UserProperty.class).getAddress()); + if(debug) + listener.getLogger().println(" User "+a.getId()+" -> "+adrs); + if (adrs != null) + rcp.add(new InternetAddress(adrs)); + else { + listener.getLogger().println("Failed to send e-mail to " + a.getFullName() + " because no e-mail address is known, and no default e-mail domain is configured"); } } }