mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-37552
This commit is contained in:
commit
e2982a3a07
@ -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() {
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user