Mark,
On 2/8/24 16:10, ma...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 712f6d8a70e0e89d66cba8a7b9cc81c717ecbe7d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 8 18:54:18 2024 +0000
Re-order so library isn't reported as running after it is terminated
---
java/org/apache/catalina/core/AprLifecycleListener.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 4ed37531fa..8fea80148e 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -170,11 +170,11 @@ public class AprLifecycleListener implements
LifecycleListener {
private static void terminateAPR() {
Library.terminatePrepare();
- Library.terminate();
- AprStatus.setAprAvailable(false);
AprStatus.setAprInitialized(false);
- sslInitialized = false; // Well we cleaned the pool in terminate.
+ AprStatus.setAprAvailable(false);
fipsModeActive = false;
+ sslInitialized = false; // Well we cleaned the pool in terminate.
+ Library.terminate();
Shouldn't we confirm that the library has successfully shut-down before
setting sslInitialized = false?
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
