(tomcat) 03/05: Re-order so library isn't reported as running after it is terminated

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit afc9bf21eb7551fab2452b228c3602d1f15c4d3c
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 d8fd5ad023..da2c0e3862 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();
     }
 
     @SuppressWarnings("deprecation")


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org