提交 0a6e00cb 编写于 作者: K Kohsuke Kawaguchi

[FIXED JENKINS-26604] Ensures GlobalSettingsProvider does not swallow fatal exceptions

Merge pull request #1546
......@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Ensures GlobalSettingsProvider does not swallow fatal exceptions
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-26604">issue 26604</a>)
<li class=rfe>
add datestamp to node-offline message
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23917">issue 23917</a>)
......
......@@ -51,11 +51,7 @@ public abstract class GlobalSettingsProvider extends AbstractDescribableImpl<Glo
public static final FilePath getSettingsFilePath(GlobalSettingsProvider settings, AbstractBuild<?, ?> build, TaskListener listener) {
FilePath settingsPath = null;
if (settings != null) {
try {
settingsPath = settings.supplySettings(build, listener);
} catch (Exception e) {
listener.getLogger().print("failed to get the path to the alternate global settings.xml");
}
settingsPath = settings.supplySettings(build, listener);
}
return settingsPath;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册