From 4d667970c4a20fea0e57fb21c8e413f067ac24c2 Mon Sep 17 00:00:00 2001
From: Anand Shah <anand.shah110@gmail.com>
Date: Fri, 4 Mar 2016 16:27:30 +0000
Subject: [PATCH] Remove SolrAutoConfiguration @PreDestroy

Remove @PreDestroy from SolrAutoConfiguration since the container will
call the close method anyway.

Fixes gh-5333
Closes gh-5339
---
 .../autoconfigure/solr/SolrAutoConfiguration.java     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
index 03b6ff5dda7..c356c53b246 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
@@ -16,10 +16,6 @@
 
 package org.springframework.boot.autoconfigure.solr;
 
-import java.io.IOException;
-
-import javax.annotation.PreDestroy;
-
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -51,13 +47,6 @@ public class SolrAutoConfiguration {
 		this.properties = properties;
 	}
 
-	@PreDestroy
-	public void close() throws IOException {
-		if (this.solrClient != null) {
-			this.solrClient.close();
-		}
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	public SolrClient solrClient() {