Merge branch '3.1.x' into 3.2.x

Closes gh-39091
This commit is contained in:
Andy Wilkinson
2024-01-11 09:56:35 +00:00
150 changed files with 358 additions and 353 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -399,7 +399,7 @@ final class JarUrlConnection extends java.net.JarURLConnection {
* Empty {@link URLStreamHandler} used to prevent the wrong JAR Handler from being
* Instantiated and cached.
*/
private static class EmptyUrlStreamHandler extends URLStreamHandler {
private static final class EmptyUrlStreamHandler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL url) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -142,7 +142,7 @@ class UrlJarFiles {
/**
* Internal cache.
*/
private static class Cache {
private static final class Cache {
private final Map<String, JarFile> jarFileUrlToJarFile = new HashMap<>();