root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 

# 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1792
spring-core/src/main/java/org/springframework/cglib/core/CodeEmitter.java
View File

File diff suppressed because it is too large Load Diff

2
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@ -392,7 +392,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
} }
else { else {
// a single resource with the given name // a single resource with the given name
return new Resource[] {getResourceLoader().getResource(locationPattern)}; return new Resource[] {getResource(locationPattern)};
} }
} }
} }