Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2017-01-13 15:32:05 -05:00
parent 3342504d7a bf642ff9db
commit c04f79fd74
4 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java
View File

@@ -115,9 +115,14 @@ public final class FailureAnalyzers {
private FailureAnalysis analyze(Throwable failure, List<FailureAnalyzer> analyzers) {
for (FailureAnalyzer analyzer : analyzers) {
FailureAnalysis analysis = analyzer.analyze(failure);
if (analysis != null) {
return analysis;
try {
FailureAnalysis analysis = analyzer.analyze(failure);
if (analysis != null) {
return analysis;
}
}
catch (Throwable ex) {
log.debug("FailureAnalyzer " + analyzer + " failed", ex);
}
}
return null;

22
spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java
View File

@@ -62,9 +62,16 @@ public class FailureAnalyzersTests {
}
@Test
public void brokenAnalyzerDoesNotPreventOtherAnalyzersFromBeingCalled() {
public void analyzerThatFailsDuringInitializationDoesNotPreventOtherAnalyzersFromBeingCalled() {
RuntimeException failure = new RuntimeException();
analyzeAndReport("broken.factories", failure);
analyzeAndReport("broken-initialization.factories", failure);
verify(failureAnalyzer, times(1)).analyze(failure);
}
@Test
public void analyzerThatFailsDuringAnalysisDoesNotPreventOtherAnalyzersFromBeingCalled() {
RuntimeException failure = new RuntimeException();
analyzeAndReport("broken-analysis.factories", failure);
verify(failureAnalyzer, times(1)).analyze(failure);
}
@@ -83,7 +90,7 @@ public class FailureAnalyzersTests {
}
static class BrokenFailureAnalyzer implements FailureAnalyzer {
static class BrokenInitializationFailureAnalyzer implements FailureAnalyzer {
static {
Object foo = null;
@@ -97,6 +104,15 @@ public class FailureAnalyzersTests {
}
static class BrokenAnalysisFailureAnalyzer implements FailureAnalyzer {
@Override
public FailureAnalysis analyze(Throwable failure) {
throw new NoClassDefFoundError();
}
}
interface BeanFactoryAwareFailureAnalyzer extends BeanFactoryAware, FailureAnalyzer {
}

2
spring-boot/src/test/resources/failure-analyzers-tests/broken.factories → spring-boot/src/test/resources/failure-analyzers-tests/broken-analysis.factories
View File

@@ -1,4 +1,4 @@
# Failure Analyzers
org.springframework.boot.diagnostics.FailureAnalyzer=\
org.springframework.boot.diagnostics.FailureAnalyzersTests$BrokenFailureAnalyzer,\
org.springframework.boot.diagnostics.FailureAnalyzersTests$BrokenAnalysisFailureAnalyzer,\
org.springframework.boot.diagnostics.FailureAnalyzersTests$BasicFailureAnalyzer

4
spring-boot/src/test/resources/failure-analyzers-tests/broken-initialization.factories Normal file
View File

@@ -0,0 +1,4 @@
# Failure Analyzers
org.springframework.boot.diagnostics.FailureAnalyzer=\
org.springframework.boot.diagnostics.FailureAnalyzersTests$BrokenAnalysisFailureAnalyzer,\
org.springframework.boot.diagnostics.FailureAnalyzersTests$BasicFailureAnalyzer