root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2557 from izeye/elasticsearch 

* elasticsearch:
  Remove unnecessary if statement
This commit is contained in:
Stephane Nicoll 2015-02-26 08:30:43 +01:00
parent a48296f5c0 0073ab078d
commit 65c974d7f6
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java
View File

@ -100,16 +100,14 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
if (logger.isInfoEnabled()) {
logger.info("Closing Elasticsearch client");
}
if (this.releasable != null) {
try {
this.releasable.close();
}
catch (NoSuchMethodError ex) {
// Earlier versions of Elasticsearch had a different method name
ReflectionUtils.invokeMethod(
ReflectionUtils.findMethod(Releasable.class, "release"),
this.releasable);
}
try {
this.releasable.close();
}
catch (NoSuchMethodError ex) {
// Earlier versions of Elasticsearch had a different method name
ReflectionUtils.invokeMethod(
ReflectionUtils.findMethod(Releasable.class, "release"),
this.releasable);
}
}
catch (final Exception ex) {