fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-37552
This commit is contained in:
Andy Wilkinson 2023-09-22 17:44:30 +01:00
commit e2982a3a07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java
View File

@ -146,7 +146,8 @@ public class JmsProperties {
private AcknowledgeMode acknowledgeMode; private AcknowledgeMode acknowledgeMode;
/** /**
* Minimum number of concurrent consumers. * Minimum number of concurrent consumers. When max-concurrency is not specified
* the minimum will also be used as the maximum.
*/ */
private Integer concurrency; private Integer concurrency;
@ -198,8 +199,7 @@ public class JmsProperties {
if (this.concurrency == null) { if (this.concurrency == null) {
return (this.maxConcurrency != null) ? "1-" + this.maxConcurrency : null; return (this.maxConcurrency != null) ? "1-" + this.maxConcurrency : null;
} }
return ((this.maxConcurrency != null) ? this.concurrency + "-" + this.maxConcurrency return this.concurrency + "-" + ((this.maxConcurrency != null) ? this.maxConcurrency : this.concurrency);
: String.valueOf(this.concurrency));
} }
public Duration getReceiveTimeout() { public Duration getReceiveTimeout() {

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsPropertiesTests.java
View File

@ -41,7 +41,7 @@ class JmsPropertiesTests {
void formatConcurrencyOnlyLowerBound() { void formatConcurrencyOnlyLowerBound() {
JmsProperties properties = new JmsProperties(); JmsProperties properties = new JmsProperties();
properties.getListener().setConcurrency(2); properties.getListener().setConcurrency(2);
assertThat(properties.getListener().formatConcurrency()).isEqualTo("2"); assertThat(properties.getListener().formatConcurrency()).isEqualTo("2-2");
} }
@Test @Test