Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-26604] Ensures GlobalSettingsProvider does not swallow…
… fatal exceptions

Merge pull request #1546
  • Loading branch information
kohsuke committed Apr 29, 2015
2 parents 0dd2dbc + 77bc6ad commit 0a6e00c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -55,6 +55,9 @@
<!-- 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>)
Expand Down
6 changes: 1 addition & 5 deletions core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
Expand Up @@ -51,11 +51,7 @@ public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest req) t
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;
}
Expand Down

0 comments on commit 0a6e00c

Please sign in to comment.