(tomcat) branch 8.5.x updated: No need for reflection here

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 06c434f327 No need for reflection here
06c434f327 is described below

commit 06c434f327ea08fd87aa85aab6b50c865af5b6fd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 8 18:22:35 2024 +0000

    No need for reflection here
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 5a0882fa18..42a5bf432b 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina.core;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -175,11 +174,8 @@ public class AprLifecycleListener implements LifecycleListener {
 
     }
 
-    private static void terminateAPR()
-            throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-        String methodName = "terminate";
-        Method method = Class.forName("org.apache.tomcat.jni.Library").getMethod(methodName, (Class[]) null);
-        method.invoke(null, (Object[]) null);
+    private static void terminateAPR() {
+        Library.terminate();
         aprAvailable = false;
         aprInitialized = false;
         sslInitialized = false; // Well we cleaned the pool in terminate.


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