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 '7.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2026-08-31 11:02:55 +02:00
parent 354ade9f40 8e783e2ec9
commit b020aca2eb
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class CheckstyleConventions {
project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize()
.set("checkstyleNohttp".equals(checkstyle.getName()) ? "1536m" : "1g"));
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
checkstyle.setToolVersion("13.10.0");
checkstyle.setToolVersion("14.1.0");
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+30 -32
View File
@@ -57,42 +57,40 @@ class ClassFileTransformerAdapter implements ClassFileTransformer {
ClassLoader loader, String className, Class<?> classBeingRedefined,
ProtectionDomain protectionDomain, byte[] classfileBuffer) {
synchronized (this) {
if (this.currentlyTransforming.get() == Boolean.TRUE) {
// Defensively back out when called from within the transform delegate below:
// in particular, for the over-eager transformer implementation in Hibernate.
return null;
}
if (this.currentlyTransforming.get() == Boolean.TRUE) {
// Defensively back out when called from within the transform delegate below:
// in particular, for the over-eager transformer implementation in Hibernate.
return null;
}
this.currentlyTransforming.set(Boolean.TRUE);
try {
byte[] transformed = this.classTransformer.transform(
loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
if (transformed != null && logger.isDebugEnabled()) {
logger.debug("Transformer of class [" + this.classTransformer.getClass().getName() +
"] transformed class [" + className + "]; bytes in=" +
classfileBuffer.length + "; bytes out=" + transformed.length);
}
return transformed;
this.currentlyTransforming.set(Boolean.TRUE);
try {
byte[] transformed = this.classTransformer.transform(
loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
if (transformed != null && logger.isDebugEnabled()) {
logger.debug("Transformer of class [" + this.classTransformer.getClass().getName() +
"] transformed class [" + className + "]; bytes in=" +
classfileBuffer.length + "; bytes out=" + transformed.length);
}
catch (ClassCircularityError ex) {
if (logger.isErrorEnabled()) {
logger.error("Circularity error while weaving class [" + className + "] with " +
"transformer of class [" + this.classTransformer.getClass().getName() + "]", ex);
}
throw new IllegalStateException("Failed to weave class [" + className + "]", ex);
return transformed;
}
catch (ClassCircularityError ex) {
if (logger.isErrorEnabled()) {
logger.error("Circularity error while weaving class [" + className + "] with " +
"transformer of class [" + this.classTransformer.getClass().getName() + "]", ex);
}
catch (Throwable ex) {
if (logger.isWarnEnabled()) {
logger.warn("Error weaving class [" + className + "] with transformer of class [" +
this.classTransformer.getClass().getName() + "]", ex);
}
// The exception will be ignored by the class loader, anyway...
throw new IllegalStateException("Could not weave class [" + className + "]", ex);
}
finally {
this.currentlyTransforming.remove();
throw new IllegalStateException("Failed to weave class [" + className + "]", ex);
}
catch (Throwable ex) {
if (logger.isWarnEnabled()) {
logger.warn("Error weaving class [" + className + "] with transformer of class [" +
this.classTransformer.getClass().getName() + "]", ex);
}
// The exception will be ignored by the class loader, anyway...
throw new IllegalStateException("Could not weave class [" + className + "]", ex);
}
finally {
this.currentlyTransforming.remove();
}
}