Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
This commit is contained in:
Juergen Hoeller
2021-09-28 18:18:23 +02:00
parent 1e6c0d2f7b 040445612f
commit 4d7fa9a632
6 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@@ -278,7 +278,7 @@ final class LogAdapter {
protected final String name;
protected transient T logger;
protected final transient T logger;
public Slf4jLog(T logger) {
this.name = logger.getName();
@@ -500,9 +500,9 @@ final class LogAdapter {
@SuppressWarnings("serial")
private static class JavaUtilLog implements Log, Serializable {
private String name;
private final String name;
private transient java.util.logging.Logger logger;
private final transient java.util.logging.Logger logger;
public JavaUtilLog(String name) {
this.name = name;