From 822458b9a5addb3f0c67e74239c0cb7c1fd0f29e Mon Sep 17 00:00:00 2001 From: mindless Date: Tue, 22 Dec 2009 17:27:09 +0000 Subject: [PATCH] [FIXED HUDSON-3279] Make maven project more resilient to exceptions from plugins git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24848 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenModule.java | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index c0254265a7..d6ccff333f 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -24,7 +24,6 @@ package hudson.maven; import hudson.CopyOnWrite; -import hudson.FilePath; import hudson.Util; import hudson.Functions; import hudson.maven.reporters.MavenMailer; @@ -49,6 +48,7 @@ import hudson.util.DescribableList; import org.apache.maven.project.MavenProject; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; import javax.servlet.ServletException; import java.io.IOException; @@ -59,7 +59,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.HashSet; -import org.kohsuke.stapler.export.Exported; +import java.util.logging.Level; +import java.util.logging.Logger; /** * {@link Job} that builds projects based on Maven2. @@ -187,6 +188,7 @@ public final class MavenModule extends AbstractMavenProject createReporters() { - List reporters = new ArrayList(); + List reporterList = new ArrayList(); - getReporters().addAllTo(reporters); - getParent().getReporters().addAllTo(reporters); + getReporters().addAllTo(reporterList); + getParent().getReporters().addAllTo(reporterList); for (MavenReporterDescriptor d : MavenReporterDescriptor.all()) { if(getReporters().contains(d)) continue; // already configured MavenReporter auto = d.newAutoInstance(this); if(auto!=null) - reporters.add(auto); + reporterList.add(auto); } - return reporters; + return reporterList; } + + private static final Logger LOGGER = Logger.getLogger(MavenModule.class.getName()); } -- GitLab