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
22c93642
Commit
22c93642
authored
Apr 02, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only use AprLifecycleListener when native library is available
Closes gh-16040
parent
db4623c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
9 deletions
+30
-9
TomcatReactiveWebServerFactory.java
...t/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
+8
-3
TomcatServletWebServerFactory.java
...ot/web/embedded/tomcat/TomcatServletWebServerFactory.java
+8
-2
TomcatReactiveWebServerFactoryTests.java
.../embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
+7
-2
TomcatServletWebServerFactoryTests.java
...b/embedded/tomcat/TomcatServletWebServerFactoryTests.java
+7
-2
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
View file @
22c93642
...
@@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets;
...
@@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.catalina.Context
;
import
org.apache.catalina.Context
;
...
@@ -67,8 +66,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
...
@@ -67,8 +66,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
private
List
<
Valve
>
engineValves
=
new
ArrayList
<>();
private
List
<
Valve
>
engineValves
=
new
ArrayList
<>();
private
List
<
LifecycleListener
>
contextLifecycleListeners
=
new
ArrayList
<>(
private
List
<
LifecycleListener
>
contextLifecycleListeners
=
getDefaultLifecycleListeners
();
Collections
.
singleton
(
new
AprLifecycleListener
()));
private
List
<
TomcatContextCustomizer
>
tomcatContextCustomizers
=
new
ArrayList
<>();
private
List
<
TomcatContextCustomizer
>
tomcatContextCustomizers
=
new
ArrayList
<>();
...
@@ -95,6 +93,13 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
...
@@ -95,6 +93,13 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
super
(
port
);
super
(
port
);
}
}
private
static
List
<
LifecycleListener
>
getDefaultLifecycleListeners
()
{
AprLifecycleListener
aprLifecycleListener
=
new
AprLifecycleListener
();
return
AprLifecycleListener
.
isAprAvailable
()
?
new
ArrayList
<>(
Arrays
.
asList
(
aprLifecycleListener
))
:
new
ArrayList
<>();
}
@Override
@Override
public
WebServer
getWebServer
(
HttpHandler
httpHandler
)
{
public
WebServer
getWebServer
(
HttpHandler
httpHandler
)
{
Tomcat
tomcat
=
new
Tomcat
();
Tomcat
tomcat
=
new
Tomcat
();
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View file @
22c93642
...
@@ -111,8 +111,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
...
@@ -111,8 +111,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
private
List
<
Valve
>
contextValves
=
new
ArrayList
<>();
private
List
<
Valve
>
contextValves
=
new
ArrayList
<>();
private
List
<
LifecycleListener
>
contextLifecycleListeners
=
new
ArrayList
<>(
private
List
<
LifecycleListener
>
contextLifecycleListeners
=
getDefaultLifecycleListeners
();
Collections
.
singleton
(
new
AprLifecycleListener
()));
private
List
<
TomcatContextCustomizer
>
tomcatContextCustomizers
=
new
ArrayList
<>();
private
List
<
TomcatContextCustomizer
>
tomcatContextCustomizers
=
new
ArrayList
<>();
...
@@ -155,6 +154,13 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
...
@@ -155,6 +154,13 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
super
(
contextPath
,
port
);
super
(
contextPath
,
port
);
}
}
private
static
List
<
LifecycleListener
>
getDefaultLifecycleListeners
()
{
AprLifecycleListener
aprLifecycleListener
=
new
AprLifecycleListener
();
return
AprLifecycleListener
.
isAprAvailable
()
?
new
ArrayList
<>(
Arrays
.
asList
(
aprLifecycleListener
))
:
new
ArrayList
<>();
}
@Override
@Override
public
WebServer
getWebServer
(
ServletContextInitializer
...
initializers
)
{
public
WebServer
getWebServer
(
ServletContextInitializer
...
initializers
)
{
Tomcat
tomcat
=
new
Tomcat
();
Tomcat
tomcat
=
new
Tomcat
();
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
View file @
22c93642
...
@@ -82,8 +82,13 @@ public class TomcatReactiveWebServerFactoryTests
...
@@ -82,8 +82,13 @@ public class TomcatReactiveWebServerFactoryTests
@Test
@Test
public
void
defaultTomcatListeners
()
{
public
void
defaultTomcatListeners
()
{
TomcatReactiveWebServerFactory
factory
=
getFactory
();
TomcatReactiveWebServerFactory
factory
=
getFactory
();
assertThat
(
factory
.
getContextLifecycleListeners
()).
hasSize
(
1
).
first
()
if
(
AprLifecycleListener
.
isAprAvailable
())
{
.
isInstanceOf
(
AprLifecycleListener
.
class
);
assertThat
(
factory
.
getContextLifecycleListeners
()).
hasSize
(
1
).
first
()
.
isInstanceOf
(
AprLifecycleListener
.
class
);
}
else
{
assertThat
(
factory
.
getContextLifecycleListeners
()).
isEmpty
();
}
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View file @
22c93642
...
@@ -134,8 +134,13 @@ public class TomcatServletWebServerFactoryTests
...
@@ -134,8 +134,13 @@ public class TomcatServletWebServerFactoryTests
@Test
@Test
public
void
defaultTomcatListeners
()
{
public
void
defaultTomcatListeners
()
{
TomcatServletWebServerFactory
factory
=
getFactory
();
TomcatServletWebServerFactory
factory
=
getFactory
();
assertThat
(
factory
.
getContextLifecycleListeners
()).
hasSize
(
1
).
first
()
if
(
AprLifecycleListener
.
isAprAvailable
())
{
.
isInstanceOf
(
AprLifecycleListener
.
class
);
assertThat
(
factory
.
getContextLifecycleListeners
()).
hasSize
(
1
).
first
()
.
isInstanceOf
(
AprLifecycleListener
.
class
);
}
else
{
assertThat
(
factory
.
getContextLifecycleListeners
()).
isEmpty
();
}
}
}
@Test
@Test
...
...
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