Merge branch '3.4.x' into 3.5.x

wilkinsona · wilkinsona · commit 80d6b8258d61 · 2025-07-14T10:01:06.000+01:00
Closes gh-46416
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java
@@ -487,7 +487,7 @@ private int getFileMode() {
 		}
 
 		private int getDirMode(FileCopyDetails details) {
-			return (BootZipCopyAction.this.fileMode != null) ? BootZipCopyAction.this.dirMode : getPermissions(details);
+			return (BootZipCopyAction.this.dirMode != null) ? BootZipCopyAction.this.dirMode : getPermissions(details);
 		}
 
 		private int getFileMode(FileCopyDetails details) {

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ private int getFileMode() {`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`private int getDirMode(FileCopyDetails details) {`
`490`		`- return (BootZipCopyAction.this.fileMode != null) ? BootZipCopyAction.this.dirMode : getPermissions(details);`
	`490`	`+ return (BootZipCopyAction.this.dirMode != null) ? BootZipCopyAction.this.dirMode : getPermissions(details);`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`private int getFileMode(FileCopyDetails details) {`