Merge branch '1.2.x'

# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-commons-dependencies/pom.xml # spring-cloud-commons/pom.xml # spring-cloud-context/pom.xml # spring-cloud-starter/pom.xml
2017-10-30 19:01:22 -04:00
parent 942df8ed45 abe5374c79
commit 449f51a748
1 changed files with 14 additions and 1 deletions
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java
@@ -102,7 +102,20 @@ public class ContextRefresher {
 		}
 		finally {
 			ConfigurableApplicationContext closeable = capture;
-			closeable.close();
+			while (closeable != null) {
+				try {
+					closeable.close();
+				}
+				catch (Exception e) {
+					// Ignore;
+				}
+				if (closeable.getParent() instanceof ConfigurableApplicationContext) {
+					closeable = (ConfigurableApplicationContext) closeable.getParent();
+				}
+				else {
+					break;
+				}
+			}
 		}

 	}