Skip to content

Commit 12cefd2

Browse files
committed
Only enable Tomcat's websocket support on Java7+
Tomcat's websocket support requires Java7 or later. That commit makes sure to register its support only when such requirement is met. Closes spring-projectsgh-4846
1 parent 835a11b commit 12cefd2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2829
import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
2930
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
@@ -61,6 +62,7 @@ static class TomcatWebSocketConfiguration {
6162

6263
@Bean
6364
@ConditionalOnMissingBean(name = "websocketContainerCustomizer")
65+
@ConditionalOnJava(ConditionalOnJava.JavaVersion.SEVEN)
6466
public EmbeddedServletContainerCustomizer websocketContainerCustomizer() {
6567
return new TomcatWebSocketContainerCustomizer();
6668
}

0 commit comments

Comments
 (0)