Merge branch '2.0.x'

7 years ago · 6970f19ce3
parent ae12d515ee 7ae82b070b
commit 6970f19ce3
1 changed files with 0 additions and 2 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
@ -16,7 +16,6 @@

 package org.springframework.boot.autoconfigure;

-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
@ -173,7 +172,6 @@ public class BackgroundPreinitializer
 		@Override
 		public void run() {
 			StandardCharsets.UTF_8.name();
-			Charset.availableCharsets();
 		}

 	}