You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2022/12/29 19:21:05 UTC
[logging-log4j2] 03/07: Check urlConnection for being instance of JarURLConnection instead of relying on protocol name
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8abcf751bd688e128504c4f8d00825a1646da66a
Author: raipc <an...@axibase.com>
AuthorDate: Fri Dec 9 02:22:22 2022 +0100
Check urlConnection for being instance of JarURLConnection instead of relying on protocol name
---
.../org/apache/logging/log4j/core/config/ConfigurationSource.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 48d7d5aa9a..19aa4adc10 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -62,8 +62,6 @@ public class ConfigurationSource {
* ConfigurationSource to use with {@link org.apache.logging.log4j.core.config.composite.CompositeConfiguration}.
*/
public static final ConfigurationSource COMPOSITE_SOURCE = new ConfigurationSource(Constants.EMPTY_BYTE_ARRAY, null, 0);
- private static final String HTTPS = "https";
- private static final String JAR = "jar";
private final InputStream stream;
private volatile byte[] data;
@@ -367,7 +365,7 @@ public class ConfigurationSource {
try {
if (file != null) {
return new ConfigurationSource(urlConnection.getInputStream(), FileUtils.fileFromUri(url.toURI()));
- } else if (JAR.equals(url.getProtocol())) {
+ } else if (urlConnection instanceof JarURLConnection) {
// Work around https://bugs.openjdk.java.net/browse/JDK-6956385.
long lastModified = new File(((JarURLConnection)urlConnection).getJarFile().getName())
.lastModified();