[tomcat] branch 10.1.x updated: tomcat-jni.jar needs to be standalone

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 2f1a40e32c tomcat-jni.jar needs to be standalone
2f1a40e32c is described below

commit 2f1a40e32c6313afb0e00a2002a9d34d12d4fc2e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 15 09:23:46 2023 +0000

    tomcat-jni.jar needs to be standalone
---
 java/org/apache/tomcat/jni/Library.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Library.java 
b/java/org/apache/tomcat/jni/Library.java
index a00d29b408..cadbcc08d1 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -18,12 +18,12 @@ package org.apache.tomcat.jni;
 
 import java.io.File;
 
-import org.apache.catalina.Globals;
-
 public final class Library {
 
     /* Default library names */
     private static final String [] NAMES = {"tcnative-2", "libtcnative-2", 
"tcnative-1", "libtcnative-1"};
+    /* System property used to define CATALINA_HOME */
+    private static final String CATALINA_HOME_PROP = "catalina.home";
     /*
      * A handle to the unique Library singleton instance.
      */
@@ -32,7 +32,7 @@ public final class Library {
     private Library() throws Exception {
         boolean loaded = false;
         StringBuilder err = new StringBuilder();
-        File binLib = new File(System.getProperty(Globals.CATALINA_HOME_PROP), 
"bin");
+        File binLib = new File(System.getProperty(CATALINA_HOME_PROP), "bin");
         for (int i = 0; i < NAMES.length; i++) {
             File library = new File(binLib, System.mapLibraryName(NAMES[i]));
             try {


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