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
The following commit(s) were added to refs/heads/main by this push:
new ac62b95 Remove use of JreCompat as it is not required with Java 11+
ac62b95 is described below
commit ac62b95775b9c6be628b7aaa8b38f4221bb56473
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 28 13:12:20 2021 +0100
Remove use of JreCompat as it is not required with Java 11+
---
.../org/apache/catalina/core/JreMemoryLeakPreventionListener.java | 8 +-------
java/org/apache/catalina/core/LocalStrings.properties | 1 -
java/org/apache/catalina/core/LocalStrings_es.properties | 2 --
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 -
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/core/LocalStrings_ko.properties | 1 -
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 -
7 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index 7bed3ad..0adcaba 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -16,7 +16,6 @@
*/
package org.apache.catalina.core;
-import java.io.IOException;
import java.net.URLConnection;
import java.sql.DriverManager;
import java.util.StringTokenizer;
@@ -28,7 +27,6 @@ import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -171,11 +169,7 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
// Set the default URL caching policy to not to cache
if (urlCacheProtection) {
- try {
-
JreCompat.getInstance().disableCachingForJarUrlConnections();
- } catch (IOException e) {
-
log.error(sm.getString("jreLeakListener.jarUrlConnCacheFail"), e);
- }
+ URLConnection.setDefaultUseCaches("JAR", false);
}
if (classesToInitialize != null) {
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index f97d42a..f79faf3 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -141,7 +141,6 @@ jniLifecycleListener.load.path=Loaded native library from
[{0}]
jniLifecycleListener.missingPathOrName=One of libraryName or libraryPath must
be set
jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat
start to prevent possible memory leaks.
-jreLeakListener.jarUrlConnCacheFail=Failed to disable Jar URL connection
caching by default
naming.addEnvEntry=Adding environment entry [{0}]
naming.addResourceEnvRef=Adding resource env ref [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties
b/java/org/apache/catalina/core/LocalStrings_es.properties
index 62ca876..758bf92 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -79,8 +79,6 @@ defaultInstanceManager.restrictedServletsResource=No se ha
hallado el fichero de
filterChain.filter=La ejecución del Filtro lanzó una excepción
filterChain.servlet=La ejecución del Servlet lanzó una excepción
-jreLeakListener.jarUrlConnCacheFail=No pude desactivar la caché de conexión
URL de Jar por defecto
-
naming.addEnvEntry=Adicionando entrada de ambiente [{0}]\n
naming.bindFailed=No pude cambiar (bind) objeto: [{0}]
naming.invalidEnvEntryType=La entrada de Entorno [{0}] tiene un tipo inválido
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index b587487..0394d08 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -141,7 +141,6 @@ jniLifecycleListener.load.path=La librairie native a été
chargée à partir de
jniLifecycleListener.missingPathOrName=Soit libraryName soit libraryPath
doivent être définis
jreLeakListener.classToInitializeFail=Echec du chargement de la classe [{0}]
pendant le démarrage de Tomcat, effectué pour empêcher de possibles fuites de
mémoire
-jreLeakListener.jarUrlConnCacheFail=Échec de la désactivation du cache par
défaut des URL de connexion de JAR
naming.addEnvEntry=Ajout de l''entrée d''environnement [{0}]
naming.addResourceEnvRef=Ajout de la référence de ressource d''environnement
[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 11e99fe..2c4bc74 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -141,7 +141,6 @@ jniLifecycleListener.load.path=[{0}] からネイティブライブラリを読
jniLifecycleListener.missingPathOrName=libraryName あるいは libraryPath
を設定しなければなりません。
jreLeakListener.classToInitializeFail=Tomcat起動中に可能なメモリーリークを防止するためのクラス[{0}]をロードすることに失敗しました。
-jreLeakListener.jarUrlConnCacheFail=既定でJar URL接続のキャッシュを無効にできませんでした。
naming.addEnvEntry=環境変数 [{0}] を追加します。
naming.addResourceEnvRef=リソースenv ref [{0}]を追加しています。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 0f25107..c848444 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -141,7 +141,6 @@ jniLifecycleListener.load.path=[{0}](으)로부터 native 라이브러리를 로
jniLifecycleListener.missingPathOrName=libraryName 또는 libraryPath, 둘 중 하나는 반드시
설정되어야 합니다.
jreLeakListener.classToInitializeFail=Tomcat을 시작하던 중, 발생 가능성 있는 메모리 누수를 방지하기
위한 클래스 [{0}]을(를) 로드하지 못했습니다.
-jreLeakListener.jarUrlConnCacheFail=기본 설정으로서, Jar URL 연결 캐싱을 사용불능 상태로 설정하지
못했습니다.
naming.addEnvEntry=Environment 엔트리 [{0}]을(를) 추가합니다.
naming.addResourceEnvRef=리소스 env ref [{0}]을(를) 추가합니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 75977b7..c7bad2f 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -142,7 +142,6 @@ jniLifecycleListener.load.path=已从[{0}]加载本机库
jniLifecycleListener.missingPathOrName=必须设置libraryName或libraryPath之一
jreLeakListener.classToInitializeFail=在tomcat启动期间未能加载类[{0}]，以防止可能的内存泄漏。
-jreLeakListener.jarUrlConnCacheFail=默认情况下无法禁用Jar URL连接缓存。
naming.addEnvEntry=添加环境条目 [{0}]
naming.addResourceEnvRef=添加资源环境引用 [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
