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
fa142d92
Commit
fa142d92
authored
Apr 11, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore Jetty 8 compatibility
Acceptors and Selectors aren't supported with Jetty 8. See gh-5380
parent
c79ecc29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
application.properties
...ot-sample-jetty/src/main/resources/application.properties
+2
-1
application.properties
...t-sample-jetty8/src/main/resources/application.properties
+2
-1
JettyEmbeddedServletContainerFactory.java
.../embedded/jetty/JettyEmbeddedServletContainerFactory.java
+12
-9
No files found.
spring-boot-samples/spring-boot-sample-jetty/src/main/resources/application.properties
View file @
fa142d92
server.compression.enabled
:
true
server.compression.min-response-size
:
1
\ No newline at end of file
server.compression.min-response-size
:
1
server.jetty.acceptors
=
2
spring-boot-samples/spring-boot-sample-jetty8/src/main/resources/application.properties
View file @
fa142d92
server.compression.enabled
:
true
server.compression.min-response-size
:
1
\ No newline at end of file
server.compression.min-response-size
:
1
server.jetty.acceptors
=
2
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @
fa142d92
...
...
@@ -154,7 +154,8 @@ public class JettyEmbeddedServletContainerFactory
ServletContextInitializer
...
initializers
)
{
JettyEmbeddedWebAppContext
context
=
new
JettyEmbeddedWebAppContext
();
int
port
=
(
getPort
()
>=
0
?
getPort
()
:
0
);
Server
server
=
createServer
(
port
);
InetSocketAddress
address
=
new
InetSocketAddress
(
getAddress
(),
port
);
Server
server
=
createServer
(
address
);
configureWebAppContext
(
context
,
initializers
);
server
.
setHandler
(
addHandlerWrappers
(
context
));
this
.
logger
.
info
(
"Server initialized with port: "
+
port
);
...
...
@@ -174,19 +175,21 @@ public class JettyEmbeddedServletContainerFactory
return
getJettyEmbeddedServletContainer
(
server
);
}
private
Server
createServer
(
int
port
)
{
private
Server
createServer
(
InetSocketAddress
address
)
{
if
(
this
.
acceptors
<
0
&&
this
.
selectors
<
0
)
{
return
new
Server
(
address
);
}
if
(!
ClassUtils
.
isPresent
(
"org.eclipse.jetty.server.ServerConnector"
,
null
))
{
this
.
logger
.
warn
(
"Acceptors and Selectors are not supported with Jetty 8"
);
return
new
Server
(
address
);
}
Server
server
=
new
Server
();
server
.
setConnectors
(
new
Connector
[]
{
createConnector
(
port
,
server
)
});
return
server
;
}
private
ServerConnector
createConnector
(
int
port
,
Server
server
)
{
ServerConnector
connector
=
new
ServerConnector
(
server
,
this
.
acceptors
,
this
.
selectors
);
InetSocketAddress
address
=
new
InetSocketAddress
(
getAddress
(),
port
);
connector
.
setHost
(
address
.
getHostName
());
connector
.
setPort
(
address
.
getPort
());
return
connector
;
server
.
setConnectors
(
new
Connector
[]
{
connector
});
return
server
;
}
private
Handler
addHandlerWrappers
(
Handler
handler
)
{
...
...
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