Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
afa5b12b
Commit
afa5b12b
authored
Jul 09, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make reactive Jetty auto-config back off without jetty-servlet
Fixes gh-22275
parent
efad6c16
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ReactiveWebServerFactoryConfiguration.java
...e/web/reactive/ReactiveWebServerFactoryConfiguration.java
+3
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java
View file @
afa5b12b
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.web.reactive;
import
java.util.stream.Collectors
;
import
io.undertow.Undertow
;
import
org.eclipse.jetty.servlet.ServletHolder
;
import
reactor.netty.http.server.HttpServer
;
import
org.springframework.beans.factory.ObjectProvider
;
...
...
@@ -100,7 +101,7 @@ abstract class ReactiveWebServerFactoryConfiguration {
@Configuration
(
proxyBeanMethods
=
false
)
@ConditionalOnMissingBean
(
ReactiveWebServerFactory
.
class
)
@ConditionalOnClass
({
org
.
eclipse
.
jetty
.
server
.
Server
.
class
})
@ConditionalOnClass
({
org
.
eclipse
.
jetty
.
server
.
Server
.
class
,
ServletHolder
.
class
})
static
class
EmbeddedJetty
{
@Bean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment