Skip to content

S
spring-boot
Commit 65c974d7 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge pull request #2557 from izeye/elasticsearch 

* elasticsearch:
  Remove unnecessary if statement
parents a48296f5 0073ab07
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java
View file @ 65c974d7
...@@ -100,7 +100,6 @@ public class ElasticsearchAutoConfiguration implements DisposableBean { ...@@ -100,7 +100,6 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
if (logger.isInfoEnabled()) { if (logger.isInfoEnabled()) {
logger.info("Closing Elasticsearch client"); logger.info("Closing Elasticsearch client");
} }
if (this.releasable != null) {
try { try {
this.releasable.close(); this.releasable.close();
} }
...@@ -111,7 +110,6 @@ public class ElasticsearchAutoConfiguration implements DisposableBean { ...@@ -111,7 +110,6 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
this.releasable); this.releasable);
} }
} }
}
catch (final Exception ex) { catch (final Exception ex) {
if (logger.isErrorEnabled()) { if (logger.isErrorEnabled()) {
logger.error("Error closing Elasticsearch client: ", ex); logger.error("Error closing Elasticsearch client: ", ex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment