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
01558100
Commit
01558100
authored
Jul 22, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not attempt to use AprLifecycleListener in a native image
Closes gh-22485
parent
87990338
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
TomcatServletWebServerFactory.java
...ot/web/embedded/tomcat/TomcatServletWebServerFactory.java
+10
-3
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View file @
01558100
...
...
@@ -110,6 +110,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
*/
public
static
final
String
DEFAULT_PROTOCOL
=
"org.apache.coyote.http11.Http11NioProtocol"
;
private
static
final
boolean
IN_NATIVE_IMAGE
=
System
.
getProperty
(
"org.graalvm.nativeimage.imagecode"
)
!=
null
;
private
File
baseDirectory
;
private
List
<
Valve
>
engineValves
=
new
ArrayList
<>();
...
...
@@ -164,9 +166,14 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
}
private
static
List
<
LifecycleListener
>
getDefaultLifecycleListeners
()
{
AprLifecycleListener
aprLifecycleListener
=
new
AprLifecycleListener
();
return
AprLifecycleListener
.
isAprAvailable
()
?
new
ArrayList
<>(
Arrays
.
asList
(
aprLifecycleListener
))
:
new
ArrayList
<>();
ArrayList
<
LifecycleListener
>
lifecycleListeners
=
new
ArrayList
<>();
if
(!
IN_NATIVE_IMAGE
)
{
AprLifecycleListener
aprLifecycleListener
=
new
AprLifecycleListener
();
if
(
AprLifecycleListener
.
isAprAvailable
())
{
lifecycleListeners
.
add
(
aprLifecycleListener
);
}
}
return
lifecycleListeners
;
}
@Override
...
...
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