spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-core/src/main/java/org/springframework/cglib/core/CodeEmitter.java
This commit is contained in:
Juergen Hoeller
2025-10-02 21:56:12 +02:00
parent b4d501f888 3041071269
commit 37319fc367
2 changed files with 959 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/cglib/core/CodeEmitter.java
+958 -834
View File
File diff suppressed because it is too large Load Diff
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
+1 -1
View File
@@ -392,7 +392,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
}
else {
// a single resource with the given name
return new Resource[] {getResourceLoader().getResource(locationPattern)};
return new Resource[] {getResource(locationPattern)};
}
}
}