Merge branch '6.1.x'

simonbasle · simonbasle · commit ce8758b83cd2 · 2024-04-16T16:47:01.000+02:00
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
@@ -227,7 +227,7 @@ public final int getIsolationLevel() {
 	 */
 	public final void setTimeout(int timeout) {
 		if (timeout < TIMEOUT_DEFAULT) {
-			throw new IllegalArgumentException("Timeout must be a positive integer or TIMEOUT_DEFAULT");
+			throw new IllegalArgumentException("Timeout must be a non-negative integer or TIMEOUT_DEFAULT");
 		}
 		this.timeout = timeout;
 	}

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public final int getIsolationLevel() {`
`227`	`227`	`*/`
`228`	`228`	`public final void setTimeout(int timeout) {`
`229`	`229`	`if (timeout < TIMEOUT_DEFAULT) {`
`230`		`- throw new IllegalArgumentException("Timeout must be a positive integer or TIMEOUT_DEFAULT");`
	`230`	`+ throw new IllegalArgumentException("Timeout must be a non-negative integer or TIMEOUT_DEFAULT");`
`231`	`231`	`}`
`232`	`232`	`this.timeout = timeout;`
`233`	`233`	`}`